diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index e18f6c4f92..241fcdca62 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -326,7 +326,7 @@ public:
 		for (uint i = 0; i < ObjectClass::GetCount(_selected_object_class); i++) {
 			const ObjectSpec *spec = ObjectClass::Get(_selected_object_class, i);
 			if (spec->IsAvailable()) {
-				this->SelectOtherObject(0);
+				this->SelectOtherObject(i);
 				return;
 			}
 		}