diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index d236483833..b1889a5116 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -835,8 +835,9 @@ public:
 				break;
 
 			default:
-				if (!gui_scope) break;
 				if (data < 0) break;
+
+				if (gui_scope) break; // only do this once; from command scope
 				from = GB(data, 0, 8);
 				to   = GB(data, 8, 8);
 				/* Moving an order. If one of these is INVALID_VEH_ORDER_ID, then
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 791e3312ed..7abe4f4f0b 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -271,7 +271,8 @@ struct TimetableWindow : Window {
 				break;
 
 			default: {
-				if (!gui_scope) break;
+				if (gui_scope) break; // only do this once; from command scope
+
 				/* Moving an order. If one of these is INVALID_VEH_ORDER_ID, then
 				 * the order is being created / removed */
 				if (this->sel_index == -1) break;