diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm
index a9e914885e0b..742ad954c20b 100644
--- a/code/modules/cm_marines/m2c.dm
+++ b/code/modules/cm_marines/m2c.dm
@@ -137,15 +137,15 @@
 	M.anchored = TRUE
 	playsound(M, 'sound/items/m56dauto_setup.ogg', 75, TRUE)
 	to_chat(user, SPAN_NOTICE("You deploy [M]."))
-	if((rounds > 0) && !user.get_inactive_hand())
-		user.set_interaction(M)
-		give_action(user, /datum/action/human_action/mg_exit)
 	M.rounds = rounds
 	M.overheat_value = overheat_value
 	M.health = health
 	M.update_icon()
 	qdel(src)
 
+	if(M.rounds > 0)
+		M.try_mount_gun(user)
+
 /obj/item/device/m2c_gun/attackby(obj/item/O as obj, mob/user as mob)
 	if(!ishuman(user))
 		return
diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm
index 632f1956ab09..15190261663c 100644
--- a/code/modules/cm_marines/smartgun_mount.dm
+++ b/code/modules/cm_marines/smartgun_mount.dm
@@ -835,8 +835,8 @@
 		if(get_step(src, opposite_dir) == user_turf)
 			found_user = TRUE
 			break
-	// If the user isn't standing behind the gun.
-	if(!found_user)
+	// If the user isn't standing behind or on top of the gun.
+	if(!found_user && user_turf != get_turf(src))
 		to_chat(user, SPAN_WARNING("You are too far from the handles to man [src]!"))
 		return