diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm
index 1624acce68..655eb5c510 100644
--- a/code/game/objects/structures/under_wardrobe.dm
+++ b/code/game/objects/structures/under_wardrobe.dm
@@ -12,13 +12,16 @@
 		user << "<span class='warning'>Sadly there's nothing in here for you to wear.</span>"
 		return 0
 
-	var/utype = alert("Which section do you want to pick from?",,"Male underwear", "Female underwear", "Undershirts")
+	var/utype = alert("Which section do you want to pick from?",,"Underwear", "Undershirts", "Socks",)
 	var/list/selection
 	switch(utype)
-		if("Male underwear")
-			selection = underwear_m
-		if("Female underwear")
-			selection = underwear_f
+		if("Underwear")
+			var/utype2 = alert("Which section do you want to pick from?",,"Male", "Female")
+			switch(utype2)
+				if("Male")
+					selection = underwear_m
+				if("Female")
+					selection = underwear_f
 		if("Undershirts")
 			selection = undershirt_t
 		if("Socks")
@@ -28,9 +31,9 @@
 		if(get_dist(src,user) > 1)
 			return
 		if(utype == "Undershirts")
-			H.undershirt = undershirt_t[pick]
+			H.undershirt = selection[pick]
 		else if(utype == "Socks")
-			H.socks = socks_t[pick]
+			H.socks = selection[pick]
 		else
 			H.underwear = selection[pick]
 		H.update_body(1)