diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 008fdf419d..426426ad2e 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -548,12 +548,16 @@
if(istype(P, /obj/item/weapon/clipboard))
var/obj/item/weapon/clipboard/CB = P
+ if(src.loc == user)
+ user.drop_from_inventory(src)
src.loc = CB
CB.toppaper = src
CB.update_icon()
to_chat(user, "You clip the [src] onto \the [CB].")
if(istype(P, /obj/item/weapon/folder))
+ if(src.loc == user)
+ user.drop_from_inventory(src)
src.loc = P
P.update_icon()
to_chat(user, "You tuck the [src] into \the [P].")