diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index b9cc1c8b9b..8ac7c852a0 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -203,6 +203,11 @@ struct DropdownWindow : Window {
 		}
 	}
 
+	void OnFocusLost() override
+	{
+		this->Close();
+	}
+
 	Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number) override
 	{
 		return this->position;
diff --git a/src/window.cpp b/src/window.cpp
index 81952d27db..5ded380e81 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2321,7 +2321,6 @@ static void StartWindowDrag(Window *w)
 	_drag_delta.y = w->top  - _cursor.pos.y;
 
 	BringWindowToFront(w);
-	CloseWindowById(WC_DROPDOWN_MENU, 0);
 }
 
 /**
@@ -2339,7 +2338,6 @@ static void StartWindowSizing(Window *w, bool to_left)
 	_drag_delta.y = _cursor.pos.y;
 
 	BringWindowToFront(w);
-	CloseWindowById(WC_DROPDOWN_MENU, 0);
 }
 
 /**