diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index e1e6ecd23f..581d90b3ed 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -330,6 +330,14 @@
 	icon_type = "cigar"
 	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 7)
 
+/obj/item/weapon/storage/fancy/cigar/cohiba
+	name = "cohiban cigar case"
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba = 7)
+
+/obj/item/weapon/storage/fancy/cigar/havana
+	name = "havanian cigar case"
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/havana = 7)
+
 /obj/item/weapon/storage/fancy/cigar/Initialize()
 	. = ..()
 	flags |= NOREACT
diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
index 96db8bf2fe..d25523312a 100644
--- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
@@ -41,6 +41,18 @@
 	display_name = "cigar"
 	path = /obj/item/clothing/mask/smokable/cigarette/cigar
 
+/datum/gear/cigar_case
+	display_name = "cigar case"
+	path = /obj/item/weapon/storage/fancy/cigar
+
+/datum/gear/cigar_case/New()
+	..()
+	var/list/cigars = list()
+	for(var/cigar in (typesof(/obj/item/weapon/storage/fancy/cigar)))
+		var/obj/item/weapon/storage/fancy/cigar/cigar_brand = cigar
+		cigars[initial(cigar_brand.name)] = cigar_brand
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigars))
+
 /datum/gear/cigarettes
 	display_name = "cigarette selection"
 	path = /obj/item/weapon/storage/fancy/cigarettes