diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 006207c3f3..7f63b74945 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -55,6 +55,17 @@
 
 	var/obj/item/W = get_active_held_item()
 
+	if(!W && A.Adjacent(src) && (isobj(A) || ismob(A)))
+		var/atom/movable/C = A
+		if(C.can_buckle && C.has_buckled_mobs())
+			if(C.buckled_mobs.len > 1)
+				var/unbuckled = input(src, "Who do you wish to unbuckle?","Unbuckle Who?") as null|mob in C.buckled_mobs
+				if(C.user_unbuckle_mob(unbuckled,src))
+					return
+			else
+				if(C.user_unbuckle_mob(C.buckled_mobs[1],src))
+					return
+
 	if(!W && get_dist(src,A) <= interaction_range)
 		A.attack_robot(src)
 		return