diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 4a8e9d250b..427c9c7c8d 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1115,7 +1115,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         if(commandMode){
             //happens sometimes
-            selectedUnits.removeAll(u -> !u.isCommandable());
+            selectedUnits.removeAll(u -> !u.allowCommand());
 
             //draw command overlay UI
             for(Unit unit : selectedUnits){
diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java
index 01c84ab75d..6213c923c3 100644
--- a/core/src/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/mindustry/ui/fragments/PlacementFragment.java
@@ -601,17 +601,17 @@ public class PlacementFragment{
                                     if(unit.controller() instanceof CommandAI cmd){
                                         activeCommands.set(cmd.command.id);
                                         activeStances.set(cmd.stance.id);
+                                    }
 
-                                        for(var command : unit.type.commands){
-                                            availableCommands.set(command.id);
-                                        }
+                                    stancesOut.clear();
+                                    unit.type.getUnitStances(unit, stancesOut);
 
-                                        stancesOut.clear();
-                                        unit.type.getUnitStances(unit, stancesOut);
+                                    for(var stance : stancesOut){
+                                        availableStances.set(stance.id);
+                                    }
 
-                                        for(var stance : stancesOut){
-                                            availableStances.set(stance.id);
-                                        }
+                                    for(var command : unit.type.commands){
+                                        availableCommands.set(command.id);
                                     }
                                 }