diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index 9f725239969..8b3bdcadf36 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -11,6 +11,11 @@
 	anchored = TRUE //curtains start secured in place
 	build_amt = 2
 	var/manipulating = FALSE //prevents queuing up multiple deconstructs and returning a bunch of cloth
+	var/curtain_material = MATERIAL_CLOTH
+
+/obj/structure/curtain/Initialize()
+	. = ..()
+	material = SSmaterials.get_material_by_name(curtain_material)
 
 /obj/structure/curtain/open
 	icon_state = "open"
@@ -76,12 +81,14 @@
 	color = "#B8F5E3"
 	anchored = FALSE
 	alpha = 200
+	curtain_material = MATERIAL_PLASTIC
 
 /obj/structure/curtain/open/medical
 	name = "plastic curtain"
 	color = "#B8F5E3"
 	anchored = FALSE
 	alpha = 200
+	curtain_material = MATERIAL_PLASTIC
 
 /obj/structure/curtain/open/bed
 	name = "bed curtain"
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 6276f1bf0db..0ee3dc6bdbc 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -15,6 +15,10 @@
 		/mob/living/silicon/robot/drone
 		)
 
+/obj/structure/plasticflaps/Initialize()
+	. = ..()
+	material = SSmaterials.get_material_by_name(MATERIAL_PLASTIC)
+
 /obj/structure/plasticflaps/CanPass(atom/A, turf/T)
 	if(istype(A) && A.checkpass(PASSGLASS))
 		return prob(60)
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index ee0b122b280..770eb834608 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -872,6 +872,7 @@
 
 /material/cloth
 	name = MATERIAL_CLOTH
+	stack_type = /obj/item/stack/material/cloth
 	stack_origin_tech = list(TECH_MATERIAL = 2)
 	door_icon_base = "wood"
 	ignition_point = T0C+232
diff --git a/html/changelogs/doxxmedearly - curtain_material_fix.yml b/html/changelogs/doxxmedearly - curtain_material_fix.yml
new file mode 100644
index 00000000000..22d83e861ee
--- /dev/null
+++ b/html/changelogs/doxxmedearly - curtain_material_fix.yml	
@@ -0,0 +1,6 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+  - bugfix: "Disassembled curtains and plastic flaps now produce the correct materials, instead of steel sheets."