diff --git a/api/config.lua b/api/config.lua
index 3fc7025d..fed7b1ca 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -463,6 +463,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "right",       "alwaysshow",       "0")
   pfUI:UpdateConfig("chat",       "right",       "width",            "380")
   pfUI:UpdateConfig("chat",       "right",       "height",           "180")
+  pfUI:UpdateConfig("chat",       "global",      "hidecombat",       "0")
   pfUI:UpdateConfig("chat",       "global",      "tabdock",          "1")
   pfUI:UpdateConfig("chat",       "global",      "tabmouse",         "0")
   pfUI:UpdateConfig("chat",       "global",      "custombg",         "0")
diff --git a/modules/chat.lua b/modules/chat.lua
index 19b3f618..8cae5e00 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -313,12 +313,22 @@ pfUI:RegisterModule("chat", function ()
       end
 
       if i == 1 then
+        -- General
         tab:SetParent(pfUI.chat.left.panelTop)
         frame:SetParent(pfUI.chat.left)
         frame.isDocked = true
         frame:SetPoint("TOPLEFT", pfUI.chat.left ,"TOPLEFT", default_border, -panelheight)
         frame:SetPoint("BOTTOMRIGHT", pfUI.chat.left ,"BOTTOMRIGHT", -default_border, panelheight)
+      elseif i == 2 then
+        -- Combat Log
+        if C.chat.global.combathide == "1" then
+          FCF_UnDockFrame(frame)
+          FCF_Close(frame)
+        elseif not frame.isDocked and not frame:IsVisible() then
+          FCF_DockFrame(frame)
+        end
       elseif i == 3 and C.chat.right.enable == "1" then
+        -- Loot & Spam
         tab:SetParent(pfUI.chat.right.panelTop)
         frame:SetParent(pfUI.chat.right)
         frame:ClearAllPoints()
diff --git a/modules/gui.lua b/modules/gui.lua
index 690782f4..3e532da6 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1492,6 +1492,7 @@ 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["Hide Combat Log"], C.chat.global, "combathide", "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")