diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index efd41f8474..bf4744f95f 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -530,7 +530,8 @@ struct TimetableWindow : Window {
 	{
 		const Vehicle *v = this->vehicle;
 
-        this->clicked_widget = widget;
+		this->clicked_widget = widget;
+		this->DeleteChildWindows(WC_QUERY_STRING);
 
 		switch (widget) {
 			case WID_VT_ORDER_VIEW: // Order view button