diff --git a/Options.lua b/Options.lua
index e5a3fa3..b8ed16a 100644
--- a/Options.lua
+++ b/Options.lua
@@ -338,6 +338,12 @@ end)
 AddClickSound(showAllButton)
 
 classesPanel:SetScript("OnShow", function()
+    if not selectedClass then
+        local _, ownClass = UnitClass("player")
+        if tabButtons[ownClass] then
+            selectedClass = ownClass
+        end
+    end
     SelectClass(selectedClass or HideCoA.CUSTOM_CLASSES[1])
 end)