diff --git a/src/window.cpp b/src/window.cpp
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2269,9 +2269,14 @@ EventState Window::HandleEditBoxKey(int 
 
 	switch (query->HandleEditBoxKey(this, wid, key, keycode, state)) {
 		case HEBR_EDITING:
+			this->SetWidgetDirty(wid);
 			this->OnEditboxChanged(wid);
 			break;
 
+		case HEBR_CURSOR:
+			this->SetWidgetDirty(wid);
+			break;
+
 		case HEBR_CONFIRM:
 			if (query->ok_button >= 0) {
 				this->OnClick(Point(), query->ok_button, 1);