diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 53afdaadf51..b8ae835d412 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -129,18 +129,17 @@
 						return
 
 		if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER) )
-				if (!beaker && !panel_open)
+				if(beaker)
+						to_chat(user, "<span class='warning'>There's already a container inside.</span>")
+				else if(panel_open)
+						to_chat(user, "<span class='warning'>Close the maintenance panel first.</span>")
+				else
 						if(!user.drop_item())
 								return 1
 						beaker =  I
 						beaker.loc = src
 						update_icon()
 						src.updateUsrDialog()
-				else
-						if(!panel_open)
-								to_chat(user, "<span class='warning'>There's already a container inside.</span>")
-						else
-								to_chat(user, "<span class='warning'>Close the maintenance panel first.</span>")
 				return 1 //no afterattack
 
 		if(is_type_in_list(I, dried_items))
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 7b596752d9c..e948ba9ba8f 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -194,7 +194,7 @@
 
 /datum/design/reagentgrinder
 	name = "Machine Design (All-In-One Grinder)"
-	desc = "The circuit board for a chemical heater."
+	desc = "The circuit board for an All-In-One Grinder."
 	id = "reagentgrinder"
 	req_tech = list("biotech" = 2, "materials" = 2, "programming" = 2)
 	build_type = IMPRINTER