diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 113f23baca..c3f7426c3f 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -272,7 +272,7 @@ struct TimetableWindow : Window {
 	int GetOrderFromTimetableWndPt(int y, [[maybe_unused]] const Vehicle *v)
 	{
 		int32_t sel = this->vscroll->GetScrolledRowFromWidget(y, this, WID_VT_TIMETABLE_PANEL, WidgetDimensions::scaled.framerect.top);
-		if (sel == INT32_MAX) return OrderID::Invalid().base();
+		if (sel == INT32_MAX) return sel;
 		assert(IsInsideBS(sel, 0, v->GetNumOrders() * 2));
 		return sel;
 	}
@@ -651,7 +651,7 @@ struct TimetableWindow : Window {
 				int selected = GetOrderFromTimetableWndPt(pt.y, v);
 
 				this->CloseChildWindows();
-				this->sel_index = (selected == OrderID::Invalid().base() || selected == this->sel_index) ? -1 : selected;
+				this->sel_index = (selected == INT32_MAX || selected == this->sel_index) ? -1 : selected;
 				break;
 			}