diff --git a/aircraft_gui.c b/aircraft_gui.c
index 7cf0cf9037..f581844645 100644
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@@ -1014,7 +1014,7 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e)
 
 			tile = _last_built_aircraft_depot_tile;
 			do {
-				if (IsTileOwner(tile, _local_player) && IsAircraftHangarTile(tile)) {
+				if (IsAircraftHangarTile(tile) && IsTileOwner(tile, _local_player)) {
 					ShowAircraftDepotWindow(tile);
 					ShowBuildAircraftWindow(tile);
 					return;
diff --git a/roadveh_gui.c b/roadveh_gui.c
index 31bb06d148..e9a8b70dd8 100644
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -892,7 +892,7 @@ static void PlayerRoadVehWndProc(Window *w, WindowEvent *e)
 
 			tile = _last_built_road_depot_tile;
 			do {
-				if (IsTileOwner(tile, _local_player) && IsTileDepotType(tile, TRANSPORT_ROAD)) {
+				if (IsTileDepotType(tile, TRANSPORT_ROAD) && IsTileOwner(tile, _local_player)) {
 					ShowRoadDepotWindow(tile);
 					ShowBuildRoadVehWindow(tile);
 					return;
diff --git a/ship_gui.c b/ship_gui.c
index 375afe857d..30a366539f 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -996,7 +996,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e)
 
 			tile = _last_built_ship_depot_tile;
 			do {
-				if (IsTileOwner(tile, _local_player) && IsTileDepotType(tile, TRANSPORT_WATER)) {
+				if (IsTileDepotType(tile, TRANSPORT_WATER) && IsTileOwner(tile, _local_player)) {
 					ShowShipDepotWindow(tile);
 					ShowBuildShipWindow(tile);
 					return;
diff --git a/train_gui.c b/train_gui.c
index 3d7c09435e..ae53cef376 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -1343,7 +1343,7 @@ static void PlayerTrainsWndProc(Window *w, WindowEvent *e)
 
 			tile = _last_built_train_depot_tile;
 			do {
-				if (IsTileOwner(tile, _local_player) && IsTileDepotType(tile, TRANSPORT_RAIL)) {
+				if (IsTileDepotType(tile, TRANSPORT_RAIL) && IsTileOwner(tile, _local_player)) {
 					ShowTrainDepotWindow(tile);
 					ShowBuildTrainWindow(tile);
 					return;