diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 3da2f36ea3..68c0b773cc 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -423,6 +423,8 @@ public:
 
 	void UpdateSelectSize()
 	{
+		EraseQueuedTouchCommand();
+
 		if (_selected_airport_index == -1) {
 			SetTileSelectSize(1, 1);
 			this->DisableWidget(WID_AP_LAYOUT_DECREASE);
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 59bc306f61..4e0c47d0b6 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -474,6 +474,7 @@ public:
 				_settings_client.gui.station_show_coverage = (widget != BDSW_LT_OFF);
 				this->LowerWidget(_settings_client.gui.station_show_coverage + BDSW_LT_OFF);
 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				EraseQueuedTouchCommand();
 				this->SetDirty();
 				break;
 		}
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index e80ea4c3a4..66facac60b 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -1369,6 +1369,8 @@ public:
 				break;
 			}
 		}
+
+		EraseQueuedTouchCommand();
 	}
 
 	virtual void OnTick()
@@ -1723,6 +1725,7 @@ struct BuildRailDepotWindow : public PickerWindowBase {
 				_build_depot_direction = (DiagDirection)(widget - WID_BRAD_DEPOT_NE);
 				this->LowerWidget(_build_depot_direction + WID_BRAD_DEPOT_NE);
 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				EraseQueuedTouchCommand();
 				this->SetDirty();
 				break;
 		}
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index f4c0030133..6678407a82 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -881,6 +881,7 @@ struct BuildRoadDepotWindow : public PickerWindowBase {
 				_road_depot_orientation = (DiagDirection)(widget - WID_BROD_DEPOT_NE);
 				this->LowerWidget(_road_depot_orientation + WID_BROD_DEPOT_NE);
 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				EraseQueuedTouchCommand();
 				this->SetDirty();
 				break;
 
@@ -1027,6 +1028,7 @@ struct BuildRoadStationWindow : public PickerWindowBase {
 				_settings_client.gui.station_show_coverage = (widget != WID_BROS_LT_OFF);
 				this->LowerWidget(_settings_client.gui.station_show_coverage + WID_BROS_LT_OFF);
 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
+				EraseQueuedTouchCommand();
 				this->SetDirty();
 				break;