diff --git a/modules/chat.lua b/modules/chat.lua
index 24e0a909..5a48debf 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -395,7 +395,7 @@ pfUI:RegisterModule("chat", function ()
   pfUI.chat:SetScript("OnEvent", function()
       if event == "PLAYER_ENTERING_WORLD" or event == "UI_SCALE_CHANGED" then
         pfUI.chat:RefreshChat()
-        if pfUI_config.chat.right.enable == "0" then
+        if pfUI_config.chat.right.enable == "0" and pfUI_config.chat.right.alwaysshow == "0" then
           pfUI.chat.right:Hide()
         end
       elseif event == "FRIENDLIST_UPDATE" or event == "PLAYER_ENTERING_WORLD" then
diff --git a/modules/config.lua b/modules/config.lua
index 68259e3c..b8990bc5 100644
--- a/modules/config.lua
+++ b/modules/config.lua
@@ -147,6 +147,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("chat",       "left",        "width",            "380")
   pfUI:UpdateConfig("chat",       "left",        "height",           "180")
   pfUI:UpdateConfig("chat",       "right",       "enable",           "0")
+  pfUI:UpdateConfig("chat",       "right",       "alwaysshow",       "0")
   pfUI:UpdateConfig("chat",       "right",       "width",            "380")
   pfUI:UpdateConfig("chat",       "right",       "height",           "180")
   pfUI:UpdateConfig("chat",       "global",       "tabdock",         "1")
diff --git a/modules/gui.lua b/modules/gui.lua
index a86c7b52..95f74c61 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -992,6 +992,7 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Left chat height:", pfUI_config.chat.left, "height")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Right chat width:", pfUI_config.chat.right, "width")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Right chat height:", pfUI_config.chat.right, "height")
+  pfUI.gui:CreateConfig(pfUI.gui.chat, "Always show right chat pane:", pfUI_config.chat.right, "alwaysshow", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Display chat-tab dock as panel:", pfUI_config.chat.global, "tabdock", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Use custom colors for chats:", pfUI_config.chat.global, "custombg", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.chat, "Chat Background color:", pfUI_config.chat.global, "background", "color")