diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 5aeb72639b0..b5762afc1e9 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -59,6 +59,12 @@
 
 	return
 
+/obj/item/weapon/clipboard/afterattack(turf/T as turf)
+	for(var/obj/item/weapon/paper/P in T)
+		P.loc = src
+		toppaper = P
+		update_icon()
+
 /obj/item/weapon/clipboard/attack_self(mob/user as mob)
 	var/dat = "<title>Clipboard</title>"
 	if(haspen)
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index a034cc0f785..bac0624ca94 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -75,6 +75,11 @@
 			name = "folder[(n_name ? text("- '[n_name]'") : null)]"
 	return
 
+/obj/item/weapon/folder/afterattack(turf/T as turf)
+	for(var/obj/item/weapon/paper/P in T)
+		P.loc = src
+		update_icon()
+
 /obj/item/weapon/folder/attack_self(mob/user as mob)
 	var/dat = "<title>[name]</title>"