diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a5874f09855..1369bb15759 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -106,6 +106,7 @@
 	can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
 	allow_quick_gather = 1
 	use_to_pickup = 1
+	storage_slots = 14
 
 /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 247c380eb27..8fd0f48c28a 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -341,8 +341,9 @@
 			P.icon_state = "pill"+pillsprite
 			reagents.trans_to(P,50)
 			if(src.loaded_pill_bottle)
-				P.loc = src.loaded_pill_bottle
-				src.updateUsrDialog()
+				if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots)
+					P.loc = loaded_pill_bottle
+					src.updateUsrDialog()
 		else if (href_list["createbottle"])
 			if(!condi)
 				var/name = reject_bad_text(input(usr,"Name:","Name your bottle!",reagents.get_master_reagent_name()))