diff --git a/api/ui-widgets.lua b/api/ui-widgets.lua
index 200f0bc2..702b9ea2 100644
--- a/api/ui-widgets.lua
+++ b/api/ui-widgets.lua
@@ -500,13 +500,16 @@ function pfUI.api.SkinDropDown(frame, offsetX, offsetY)
 end
 
 function pfUI.api.SkinTab(frame, fixed)
+  frame:SetHeight(20)
   StripTextures(frame)
   CreateBackdrop(frame)
 
   if not fixed then
     frame:SetScript("OnShow", function()
       this:SetWidth(this:GetTextWidth() + 20)
-      _G[this:GetName().."Text"]:SetPoint("CENTER", 0, 0)
+      if this.GetFontString and this:GetFontString() then
+        this:GetFontString():SetPoint("CENTER", 0, 0)
+      end
     end)
   end
 end
diff --git a/skins/blizzard/character.lua b/skins/blizzard/character.lua
index f006bae6..267e1545 100644
--- a/skins/blizzard/character.lua
+++ b/skins/blizzard/character.lua
@@ -370,7 +370,6 @@ pfUI:RegisterSkin("Character", function ()
         local tab = _G["CharacterFrameTab"..i]
         SkinTab(tab)
         tab.backdrop:SetFrameLevel(1)
-        tab:SetHeight(18)
 
         if i ~= 1 then
           local lastTab = _G["CharacterFrameTab"..(i-1)]