diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index 6401ce034f3..6a773177c59 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -6,6 +6,15 @@
 	density = 1
 	anchored = 1
 
+/obj/structure/dresser/proc/convUnM(mund)
+	return underwear_m.Find(mund)
+
+/obj/structure/dresser/proc/convUnF(fund)
+	return underwear_f.Find(fund)
+
+/obj/structure/dresser/proc/convUs(us)
+	return undershirt_list.Find(us)
+
 /obj/structure/dresser/attack_hand(mob/user as mob)
 	if(!Adjacent(user))//no tele-grooming
 		return
@@ -18,14 +27,26 @@
 			return
 		switch(choice)
 			if("Underwear")
-				var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in underwear_list
-				if(new_undies)
-					H.underwear = new_undies
+				if(H.gender == FEMALE)
+					var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in underwear_f
+					if(new_undies)
+						H << "\red You selected [new_undies]."
+						var/freturn = convUnF(new_undies)
+						H.underwear = freturn
+
+				else
+					var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in underwear_m
+					if(new_undies)
+						H << "\red You selected [new_undies]."
+						var/mreturn = convUnM(new_undies)
+						H.underwear = mreturn
 
 			if("Undershirt")
 				var/new_undershirt = input(user, "Select your undershirt", "Changing") as null|anything in undershirt_list
 				if(new_undershirt)
-					H.undershirt = new_undershirt
+					H << "\red You selected [new_undershirt]"
+					var/usreturn = convUs(new_undershirt)
+					H.undershirt = usreturn
 
 		add_fingerprint(H)
 		H.update_body()
\ No newline at end of file