diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index f4962da8cfe..67d2e5045de 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -379,7 +379,9 @@ GLOBAL_LIST_INIT(chem_master_containers, list(
 
 	// Generate item name
 	var/item_name_default = initial(container_style.name)
-	if(!(initial(container_style.reagent_flags) & OPENCONTAINER)) // Closed containers get reagent name and units in the name
+	if(selected_container == default_container) // Tubes and bottles gain reagent name
+		item_name_default = "[reagents.get_master_reagent_name()] [item_name_default]"
+	if(!(initial(container_style.reagent_flags) & OPENCONTAINER)) // Closed containers get both reagent name and units in the name
 		item_name_default = "[reagents.get_master_reagent_name()] [item_name_default] ([volume_in_each]u)"
 	var/item_name = tgui_input_text(usr,
 		"Container name",