diff --git a/Assets/Handlers/BuildingHandler.cs b/Assets/Handlers/BuildingHandler.cs
index ecf88bc..3ff63fc 100644
--- a/Assets/Handlers/BuildingHandler.cs
+++ b/Assets/Handlers/BuildingHandler.cs
@@ -75,7 +75,7 @@ namespace AsteroidGame.Handlers
 
         protected override void OnBuild(InputAction.CallbackContext context)
         {
-            EnterBuildMode();
+            EnterBuildMode(buildingSelector);
         }
 
         public void PlaceStructure()
@@ -94,10 +94,11 @@ namespace AsteroidGame.Handlers
             isBuilding = false;
         }
 
-        public void EnterBuildMode()
+        public void EnterBuildMode(int index)
         {
             if (isBuilding) return;
             isBuilding = true;
+            SetBuildingIndex(index);
             SpawnGhostStructure();
         }