diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 70fe231b88..b01ac2d8f6 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -278,18 +278,13 @@ public class DesktopInput extends InputHandler{
         shouldShoot = !scene.hasMouse() && !locked;
 
         if(!locked && state.rules.unitCommand && block == null){
-            if(input.keyTap(Binding.commandMode)){
-                commandMode = !commandMode;
-            }
+            //if(input.keyTap(Binding.commandMode)){
+                commandMode = input.keyDown(Binding.commandMode);
+            //}
         }else{
             commandMode = false;
         }
 
-        //TODO should selected units be cleared out of command mode?
-        if(!commandMode){
-            //selectedUnits.clear();
-        }
-
         //validate commanding units
         selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid());