diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 40d0a9e4433..f7fd4e682cf 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -83,7 +83,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 		return ITEM_INTERACT_COMPLETE
 
 	if(used.is_open_container())
-		return ITEM_INTERACT_COMPLETE
+		return ITEM_INTERACT_SKIP_TO_AFTER_ATTACK
 
 	return ..()
 
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 65d6d3c5fd4..3bb2d514ce9 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -91,7 +91,7 @@ Note: Must be placed west/left of and R&D console to function.
 		return ITEM_INTERACT_COMPLETE
 
 	if(used.is_open_container())
-		return ITEM_INTERACT_COMPLETE
+		return ITEM_INTERACT_SKIP_TO_AFTER_ATTACK
 
 	return ..()
 
diff --git a/code/tests/attack_chain/test_attack_chain_machinery.dm b/code/tests/attack_chain/test_attack_chain_machinery.dm
index 873dc14b614..7755af16cfe 100644
--- a/code/tests/attack_chain/test_attack_chain_machinery.dm
+++ b/code/tests/attack_chain/test_attack_chain_machinery.dm
@@ -158,3 +158,14 @@
 	player.retrieve(screwdriver)
 	player.click_on(firealarm_frame)
 	TEST_ASSERT_LAST_CHATLOG(player, "You close the panel")
+	player.put_away(screwdriver)
+
+	var/obj/protolathe = teleport_to_first(player, /obj/machinery/r_n_d/protolathe)
+	var/obj/item/reagent_containers/bottle = player.spawn_obj_in_hand(/obj/item/reagent_containers/glass/bottle/ammonia)
+	player.click_on(protolathe)
+	TEST_ASSERT_LAST_CHATLOG(player, "You transfer 10 units of the solution to Protolathe.")
+
+	var/obj/imprinter = teleport_to_first(player, /obj/machinery/r_n_d/circuit_imprinter)
+	bottle.amount_per_transfer_from_this = 5
+	player.click_on(imprinter)
+	TEST_ASSERT_LAST_CHATLOG(player, "You transfer 5 units of the solution to Circuit Imprinter.")