diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index fd5bcd10108..39ae900d6bc 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -98,8 +98,14 @@
 
 	if(is_pen(user.get_active_hand()))
 		rename(user)
-	else
-		return ..()
+		return
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/obj/item/I = H.is_in_hands(/obj/item/paper)
+		if(I)
+			ProcFoldPlane(H, I)
+			return
+	return ..()
 
 /obj/item/paper/proc/rename(mob/user)
 	if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 45ec3a50214..16999baf0ed 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -108,20 +108,6 @@
 			E.take_damage(8, 1)
 		H.emote("scream")
 
-/obj/item/paper/AltClick(mob/user, obj/item/I)
-	if(in_range(user, src) && !user.incapacitated())
-		if(is_pen(user.get_active_hand()))
-			rename()
-			return
-
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		I = H.is_in_hands(/obj/item/paper)
-		if(I)
-			ProcFoldPlane(H, I)
-	else
-		..()
-
 /obj/item/paper/proc/ProcFoldPlane(mob/living/carbon/user, obj/item/I)
 	if(istype(user))
 		if((!in_range(src, user)) || user.stat || user.restrained())