diff --git a/modules/chat.lua b/modules/chat.lua
index e7ed11e..7db16f8 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -460,6 +460,8 @@ pfUI:RegisterModule("chat", function ()
   for i=1, NUM_CHAT_WINDOWS do
     _G["ChatFrame" .. i .. "UpButton"]:Hide()
     _G["ChatFrame" .. i .. "UpButton"].Show = function() return end
+    _G["ChatFrame" .. i .. "Tab"]:Hide()
     _G["ChatFrame" .. i .. "DownButton"]:Hide()
     _G["ChatFrame" .. i .. "DownButton"].Show = function() return end
     _G["ChatFrame" .. i .. "BottomButton"]:Hide()
@@ -486,6 +488,26 @@ pfUI:RegisterModule("chat", function ()
     -- Detect if mouse is over any chat frames and if so show their tabs, if not hide them
     local chatFrame, chatTab

+  local visible
+  for i=1, NUM_CHAT_WINDOWS do
+    if MouseIsOver(pfUI.chat.left, 10, 10, 10, 10) or
+       MouseIsOver(pfUI.chat.right, 10, 10, 10, 10) then
+      _G["ChatFrame" .. i .. "Tab"]:SetAlpha(1)
+      visible = true
+    else
+      _G["ChatFrame" .. i .. "Tab"]:SetAlpha(0)
+    end
+  end
+  if visible then
+    pfUI.chat.left.panelTop:SetAlpha(1)
+    pfUI.chat.right.panelTop:SetAlpha(1)
+  else
+    pfUI.chat.left.panelTop:SetAlpha(0)
+    pfUI.chat.right.panelTop:SetAlpha(0)
+  end
+
     if ( MOVING_CHATFRAME ) then
       -- Set buttons to the left or right side of the frame
       -- If the the side of the buttons changes and the frame is the default frame, then set every docked frames buttons to the same side