diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
index f46ddaf07e..b7aedb8790 100644
--- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -66,6 +66,10 @@
 	display_name = "Sunglasses, stylish"
 	path = /obj/item/clothing/glasses/fakesunglasses
 
+/datum/gear/eyes/glasses/fakeaviator
+	display_name = "Sunglasses, stylish aviators"
+	path = /obj/item/clothing/glasses/fakesunglasses/aviator
+
 /datum/gear/eyes/shades/prescriptionsun
 	display_name = "sunglasses, presciption (Security/Command)"
 	path = /obj/item/clothing/glasses/sunglasses/prescription
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index e3f17e3f6c..04770b5668 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -241,6 +241,11 @@ BLIND     // can't see anything
 	icon_state = "sun"
 	item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses")
 
+/obj/item/clothing/glasses/fakesunglasses/aviator
+	desc = "A pair of designer sunglasses. Doesn't seem like it'll block flashes."
+	name = "stylish aviators"
+	icon_state = "sec_flash"
+
 /obj/item/clothing/glasses/sunglasses/sechud
 	name = "HUDSunglasses"
 	desc = "Sunglasses with a HUD."
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0876abeeda..a016697827 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -676,10 +676,11 @@
 	if(istype(src.glasses, /obj/item/clothing/glasses/thermal))
 		number -= 1
 	if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
-		number += 1
-	if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/sechud/aviator))
-		var/obj/item/clothing/glasses/sunglasses/sechud/aviator/S = src.glasses
-		if(!S.on)
+		if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/sechud/aviator))
+			var/obj/item/clothing/glasses/sunglasses/sechud/aviator/S = src.glasses
+			if(!S.on)
+				number += 1
+		else
 			number += 1
 	if(istype(src.glasses, /obj/item/clothing/glasses/welding))
 		var/obj/item/clothing/glasses/welding/W = src.glasses