diff --git a/api/config.lua b/api/config.lua
index 075e371f..4ccc7b73 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -431,6 +431,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "right",       "width",            "380")
   pfUI:UpdateConfig("chat",       "right",       "height",           "180")
   pfUI:UpdateConfig("chat",       "global",      "tabdock",          "1")
+  pfUI:UpdateConfig("chat",       "global",      "tabmouse",         "0")
   pfUI:UpdateConfig("chat",       "global",      "custombg",         "0")
   pfUI:UpdateConfig("chat",       "global",      "background",       ".2,.2,.2,.5")
   pfUI:UpdateConfig("chat",       "global",      "border",           ".4,.4,.4,.5")
diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua
index c37140bc..eedc4545 100644
--- a/env/translations_deDE.lua
+++ b/env/translations_deDE.lua
@@ -111,7 +111,7 @@ pfUI_translation["deDE"] = {
   ["Enable Auto-Resize Loot Frame"] = nil,
   ["Enable Buff Indicators"] = nil,
   ["Enable Castbars"] = nil,
-  ["Enable Chat Dock"] = nil,
+  ["Enable Chat Dock Background"] = nil,
   ["Enable Chat Fade"] = nil,
   ["Enable Class Color in Text"] = nil,
   ["Enable Class Colors"] = nil,
@@ -211,6 +211,7 @@ pfUI_translation["deDE"] = {
   ["Name"] = nil,
   ["Nameplates"] = nil,
   ["Nameplate Width"] = nil,
+  ["Only Show Chat Dock On Mouseover"] = nil,
   ["Only Show Indicators for Dispellable Debuffs"] = nil,
   ["Other Panel: Minimap"] = nil,
   ["Panel Border Size"] = nil,
diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua
index a84945f2..f929b9c9 100644
--- a/env/translations_enUS.lua
+++ b/env/translations_enUS.lua
@@ -111,7 +111,7 @@ pfUI_translation["enUS"] = {
   ["Enable Auto-Resize Loot Frame"] = nil,
   ["Enable Buff Indicators"] = nil,
   ["Enable Castbars"] = nil,
-  ["Enable Chat Dock"] = nil,
+  ["Enable Chat Dock Background"] = nil,
   ["Enable Chat Fade"] = nil,
   ["Enable Class Color in Text"] = nil,
   ["Enable Class Colors"] = nil,
@@ -211,6 +211,7 @@ pfUI_translation["enUS"] = {
   ["Name"] = nil,
   ["Nameplates"] = nil,
   ["Nameplate Width"] = nil,
+  ["Only Show Chat Dock On Mouseover"] = nil,
   ["Only Show Indicators for Dispellable Debuffs"] = nil,
   ["Other Panel: Minimap"] = nil,
   ["Panel Border Size"] = nil,
diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua
index 9e90af1a..920dbd47 100644
--- a/env/translations_frFR.lua
+++ b/env/translations_frFR.lua
@@ -111,7 +111,7 @@ pfUI_translation["frFR"] = {
   ["Enable Auto-Resize Loot Frame"] = "Activer l'ajustement automatique de la fenêtre de butin",
   ["Enable Buff Indicators"] = "Activer les indications des améliorations",
   ["Enable Castbars"] = "Activer les barres d'incantation",
-  ["Enable Chat Dock"] = "Activer les onglets de la fenêtre du chat",
+  ["Enable Chat Dock Background"] = "Activer les onglets de la fenêtre du chat",
   ["Enable Chat Fade"] = "Activer le masquage automatique de la fenêtre du chat",
   ["Enable Class Color in Text"] = "Activer le texte basé sur la couleur la classe",
   ["Enable Class Colors"] = "Activer la couleur en fonction de la classe",
@@ -211,6 +211,7 @@ pfUI_translation["frFR"] = {
   ["Name"] = "Nom",
   ["Nameplates"] = "Barres de vie flottantes",
   ["Nameplate Width"] = "Largeur des barres de vie flottantes",
+  ["Only Show Chat Dock On Mouseover"] = nil,
   ["Only Show Indicators for Dispellable Debuffs"] = "Afficher les indicateurs pour les affaiblissements dissipables uniquement",
   ["Other Panel: Minimap"] = "Autre panneau : Minicarte",
   ["Panel Border Size"] = "Taille de la bordure du panneau",
diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua
index aeb1b54f..67e6f747 100644
--- a/env/translations_koKR.lua
+++ b/env/translations_koKR.lua
@@ -111,7 +111,7 @@ pfUI_translation["koKR"] = {
   ["Enable Auto-Resize Loot Frame"] = "자동 크기 조정 룻팅프레임 활성화",
   ["Enable Buff Indicators"] = "버프 표시기 활성화",
   ["Enable Castbars"] = "캐스트바 활성화",
-  ["Enable Chat Dock"] = "채팅 덕 활성화",
+  ["Enable Chat Dock Background"] = "채팅 덕 활성화",
   ["Enable Chat Fade"] = "채팅 사라짐 활성화",
   ["Enable Class Color in Text"] = "텍스트에 클래스(직업)색상 활성화",
   ["Enable Class Colors"] = "클래스(직업) 색상 활성화",
@@ -211,6 +211,7 @@ pfUI_translation["koKR"] = {
   ["Name"] = "이름",
   ["Nameplates"] = "상바",
   ["Nameplate Width"] = "상바 넓이",
+  ["Only Show Chat Dock On Mouseover"] = nil,
   ["Only Show Indicators for Dispellable Debuffs"] = "해체 가능한 디버프에 대한 표시만 보기",
   ["Other Panel: Minimap"] = "나머지 패널:미니맵",
   ["Panel"] = "패널",
diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua
index d5062678..fbffc754 100644
--- a/env/translations_ruRU.lua
+++ b/env/translations_ruRU.lua
@@ -111,7 +111,7 @@ pfUI_translation["ruRU"] = {
   ["Enable Auto-Resize Loot Frame"] = nil,
   ["Enable Buff Indicators"] = nil,
   ["Enable Castbars"] = nil,
-  ["Enable Chat Dock"] = nil,
+  ["Enable Chat Dock Background"] = nil,
   ["Enable Chat Fade"] = nil,
   ["Enable Class Color in Text"] = nil,
   ["Enable Class Colors"] = nil,
@@ -211,6 +211,7 @@ pfUI_translation["ruRU"] = {
   ["Name"] = nil,
   ["Nameplates"] = nil,
   ["Nameplate Width"] = nil,
+  ["Only Show Chat Dock On Mouseover"] = nil,
   ["Only Show Indicators for Dispellable Debuffs"] = nil,
   ["Other Panel: Minimap"] = nil,
   ["Panel Border Size"] = nil,
diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua
index 800e2caf..75413ab2 100644
--- a/env/translations_zhCN.lua
+++ b/env/translations_zhCN.lua
@@ -111,7 +111,7 @@ pfUI_translation["zhCN"] = {
   ["Enable Auto-Resize Loot Frame"] = "自动调整拾取框大小",
   ["Enable Buff Indicators"] = "在头像框架上显示Buff",
   ["Enable Castbars"] = "显示敌对施法条",
-  ["Enable Chat Dock"] = "显示聊天窗口停靠栏",
+  ["Enable Chat Dock Background"] = "显示聊天窗口停靠栏",
   ["Enable Chat Fade"] = "聊天记录淡出",
   ["Enable Class Color in Text"] = "启用职业文字颜色样式",
   ["Enable Class Colors On Enemies"] = "显示敌军职业颜色",
@@ -211,6 +211,7 @@ pfUI_translation["zhCN"] = {
   ["Nameplates"] = "姓名板",
   ["Nameplate Width"] = "姓名板高度",
   ["Name"] = "名字",
+  ["Only Show Chat Dock On Mouseover"] = nil,
   ["Only Show Indicators for Dispellable Debuffs"] = "只显示可驱散的Debuff",
   ["Other Panel: Minimap"] = "小地图面板",
   ["Panel Border Size"] = "面板边框大小",
diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua
index 1bde1bf4..a66c540b 100644
--- a/env/translations_zhTW.lua
+++ b/env/translations_zhTW.lua
@@ -111,7 +111,7 @@ pfUI_translation["zhTW"] = {
   ["Enable Auto-Resize Loot Frame"] = "自動調整拾取框大小",
   ["Enable Buff Indicators"] = "在頭像框架上顯示Buff",
   ["Enable Castbars"] = "顯示敵對施法條",
-  ["Enable Chat Dock"] = "顯示聊天視窗停靠欄",
+  ["Enable Chat Dock Background"] = "顯示聊天視窗停靠欄",
   ["Enable Chat Fade"] = "聊天記錄淡出",
   ["Enable Class Color in Text"] = "啟用職業文字顏色樣式",
   ["Enable Class Colors"] = "使用職業顏色",
diff --git a/modules/chat.lua b/modules/chat.lua
index 4bd0b612..8628df0a 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -369,6 +369,19 @@ pfUI:RegisterModule("chat", function ()
     end
   end
 
+  if C.chat.global.tabmouse == "1" then
+    pfUI.chat.mouseovertab = CreateFrame("Frame")
+    pfUI.chat.mouseovertab:SetScript("OnUpdate", function()
+      if MouseIsOver(pfUI.chat.left) or MouseIsOver(pfUI.chat.right) then
+        pfUI.chat.left.panelTop:Show()
+        pfUI.chat.right.panelTop:Show()
+      else
+        pfUI.chat.left.panelTop:Hide()
+        pfUI.chat.right.panelTop:Hide()
+      end
+    end)
+  end
+
   function pfUI.chat.SetupRightChat(state)
     if state then
       C.chat.right.enable = "1"
diff --git a/modules/gui.lua b/modules/gui.lua
index b81742bd..de0fcc10 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1401,7 +1401,8 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(this, T["Right Chat Width"], C.chat.right, "width")
       CreateConfig(this, T["Right Chat Height"], C.chat.right, "height")
       CreateConfig(this, T["Enable Right Chat Window"], C.chat.right, "alwaysshow", "checkbox")
-      CreateConfig(this, T["Enable Chat Dock"], C.chat.global, "tabdock", "checkbox")
+      CreateConfig(this, T["Enable Chat Dock Background"], C.chat.global, "tabdock", "checkbox")
+      CreateConfig(this, T["Only Show Chat Dock On Mouseover"], C.chat.global, "tabmouse", "checkbox")
       CreateConfig(this, T["Enable Custom Colors"], C.chat.global, "custombg", "checkbox")
       CreateConfig(this, T["Chat Background Color"], C.chat.global, "background", "color")
       CreateConfig(this, T["Chat Border Color"], C.chat.global, "border", "color")