diff --git a/src/train_gui.cpp b/src/train_gui.cpp
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -33,8 +33,7 @@ void CcBuildWagon(const CommandCost &res
 	const Vehicle *found = NULL;
 	const Train *t;
 	FOR_ALL_TRAINS(t) {
-		if (t->IsFrontEngine() && t->tile == tile &&
-				t->track == TRACK_BIT_DEPOT) {
+		if (t->IsFrontEngine() && t->tile == tile && t->IsStoppedInDepot()) {
 			if (found != NULL) return; // must be exactly one.
 			found = t;
 		}