diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
index 9b55856e8aa..48917c7e149 100644
--- a/megamek/src/megamek/client/ui/swing/MovementDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
@@ -124,7 +124,7 @@ public enum MoveCommand implements PhaseCommand {
         MOVE_SEARCHLIGHT("moveSearchlight", CMD_GROUND),
         MOVE_LAY_MINE("moveLayMine", CMD_TANK | CMD_INF),
         MOVE_HULL_DOWN("moveHullDown", CMD_MEK | CMD_TANK),
-        MOVE_CLIMB_MODE("moveClimbMode", CMD_MEK | CMD_TANK | CMD_INF),
+        MOVE_CLIMB_MODE("moveClimbMode", CMD_MEK | CMD_TANK | CMD_INF | CMD_PROTOMEK),
         MOVE_SWIM("moveSwim", CMD_MEK),
         MOVE_SHAKE_OFF("moveShakeOff", CMD_TANK | CMD_VTOL),
         MOVE_BRACE("moveBrace", CMD_MEK),
diff --git a/megamek/testresources/data/scenarios/test_setups/ProtoClimb.mms b/megamek/testresources/data/scenarios/test_setups/ProtoClimb.mms
new file mode 100644
index 00000000000..abc306ff6d5
--- /dev/null
+++ b/megamek/testresources/data/scenarios/test_setups/ProtoClimb.mms
@@ -0,0 +1,13 @@
+MMSVersion: 2
+name: Protomeks and Buildings
+planet: None
+description: Test climb mode on protomeks with buildings
+map: Deserts/16x17 AeroBase 1.board
+
+factions:
+  - name: Test Player
+
+    units:
+      - fullname: Cecerops 3
+        at: [ 10, 10 ]
+