diff --git a/planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c b/planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
index 69690c5f1..ff221db6d 100644
--- a/planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
+++ b/planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
@@ -623,7 +623,7 @@ public func FxIntSearchInteractionObjectsTimer(object target, effect, int time)
 		}
 		
 		// if carrying heavy, add drop-carry-heavy-button
-		if(target->~IsCarryingHeavy())
+		if(target->~IsCarryingHeavy() && target->GetAction() == "Walk")
 			ActionButton(target, i++, target->GetCarryHeavy(), ACTIONTYPE_CARRYHEAVY, hotkey++);
 		
 		// add vehicles
@@ -806,4 +806,3 @@ public func ReorderCrewSelectors(object leaveout)
 		j++;
 	}
 }
-
diff --git a/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
index 27c6815eb..02ed812ba 100644
--- a/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
+++ b/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
@@ -855,7 +855,7 @@ public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool re
 	{
 		if(ObjectControlInteract(plr,ctrl))
 			return true;
-		else if(IsCarryingHeavy())
+		else if(IsCarryingHeavy() && GetAction() == "Walk")
 		{
 			GetCarryHeavy()->Drop();
 			return true;