diff --git a/RootDesk/MyDesk/SlayDeckController.codeblock b/RootDesk/MyDesk/SlayDeckController.codeblock
index 20a3a90..aefbdb6 100644
--- a/RootDesk/MyDesk/SlayDeckController.codeblock
+++ b/RootDesk/MyDesk/SlayDeckController.codeblock
@@ -1060,7 +1060,7 @@
             "Name": null
           },
           "Arguments": [],
-          "Code": "self.CodexMode = true\nself.ClassDeckMode = false\nlocal list = {}\nfor id, c in pairs(self.Cards) do\n\tif c.curse ~= true then\n\t\ttable.insert(list, id)\n\tend\nend\ntable.sort(list)\nself.CodexCards = list\nlocal close = _EntityService:GetEntityByPath(\"/ui/DefaultGroup/DeckAllHud/Close\")\nif close ~= nil and close.ButtonComponent ~= nil then\n\tif self.AllDeckCloseHandler ~= nil then\n\t\tclose:DisconnectEvent(ButtonClickEvent, self.AllDeckCloseHandler)\n\tend\n\tself.AllDeckCloseHandler = close:ConnectEvent(ButtonClickEvent, function() self:CloseAllDeck() end)\nend\nself:SetEntityEnabled(\"/ui/DefaultGroup/LobbyHud\", false)\nlocal hud = _EntityService:GetEntityByPath(\"/ui/DefaultGroup/DeckAllHud\")\nif hud ~= nil then\n\thud.Enable = true\nend\nself:RenderAllDeck()",
+          "Code": "self.CodexMode = true\nself.ClassDeckMode = true\nlocal close = _EntityService:GetEntityByPath(\"/ui/DefaultGroup/DeckAllHud/Close\")\nif close ~= nil and close.ButtonComponent ~= nil then\n\tif self.AllDeckCloseHandler ~= nil then\n\t\tclose:DisconnectEvent(ButtonClickEvent, self.AllDeckCloseHandler)\n\tend\n\tself.AllDeckCloseHandler = close:ConnectEvent(ButtonClickEvent, function() self:CloseAllDeck() end)\nend\nself:BindClassDeckTabs()\nself:SetEntityEnabled(\"/ui/DefaultGroup/LobbyHud\", false)\nself:SetClassDeckTab(\"warrior\")\nlocal hud = _EntityService:GetEntityByPath(\"/ui/DefaultGroup/DeckAllHud\")\nif hud ~= nil then\n\thud.Enable = true\nend\nself:RenderAllDeck()",
           "Scope": 2,
           "ExecSpace": 6,
           "Attributes": [],
diff --git a/tools/deck/gen-slaydeck.mjs b/tools/deck/gen-slaydeck.mjs
index a01a701..e034731 100644
--- a/tools/deck/gen-slaydeck.mjs
+++ b/tools/deck/gen-slaydeck.mjs
@@ -3076,15 +3076,7 @@ bindClick("/ui/DefaultGroup/LobbyHud/AscPlus", function() self:AdjustAscension(1
 bindClick("/ui/DefaultGroup/BoardHud/Close", function() self:CloseBoard() end)
 bindClick("/ui/DefaultGroup/SoulShopHud/Close", function() self:CloseSoulShop() end)`),
     method('ShowCodex', `self.CodexMode = true
-self.ClassDeckMode = false
-local list = {}
-for id, c in pairs(self.Cards) do
-	if c.curse ~= true then
-		table.insert(list, id)
-	end
-end
-table.sort(list)
-self.CodexCards = list
+self.ClassDeckMode = true
 local close = _EntityService:GetEntityByPath("/ui/DefaultGroup/DeckAllHud/Close")
 if close ~= nil and close.ButtonComponent ~= nil then
 	if self.AllDeckCloseHandler ~= nil then
@@ -3092,7 +3084,9 @@ if close ~= nil and close.ButtonComponent ~= nil then
 	end
 	self.AllDeckCloseHandler = close:ConnectEvent(ButtonClickEvent, function() self:CloseAllDeck() end)
 end
+self:BindClassDeckTabs()
 self:SetEntityEnabled("/ui/DefaultGroup/LobbyHud", false)
+self:SetClassDeckTab("warrior")
 local hud = _EntityService:GetEntityByPath("/ui/DefaultGroup/DeckAllHud")
 if hud ~= nil then
 	hud.Enable = true