diff --git a/Cmdr/CmdrClient/CmdrInterface/Window.lua b/Cmdr/CmdrClient/CmdrInterface/Window.lua
index 38b29ae9..f0287023 100644
--- a/Cmdr/CmdrClient/CmdrInterface/Window.lua
+++ b/Cmdr/CmdrClient/CmdrInterface/Window.lua
@@ -79,8 +79,10 @@ function Window:SetVisible(visible)
 	if visible then
 		self.PreviousChatWindowConfigurationEnabled = TextChatService.ChatWindowConfiguration.Enabled
 		self.PreviousChatInputBarConfigurationEnabled = TextChatService.ChatInputBarConfiguration.Enabled
+		self.PreviousChannelTabsConfigurationEnabled = TextChatService.ChannelTabsConfiguration.Enabled
 		TextChatService.ChatWindowConfiguration.Enabled = false
 		TextChatService.ChatInputBarConfiguration.Enabled = false
+		TextChatService.ChannelTabsConfiguration.Enabled = false
 
 		Entry.TextBox:CaptureFocus()
 		self:SetEntryText("")
@@ -97,6 +99,9 @@ function Window:SetVisible(visible)
 				~= nil
 			then self.PreviousChatInputBarConfigurationEnabled
 			else true
+		TextChatService.ChannelTabsConfiguration.Enabled = if self.PreviousChannelTabsConfigurationEnabled ~= nil
+			then self.PreviousChannelTabsConfigurationEnabled
+			else true
 
 		Entry.TextBox:ReleaseFocus()
 		self.AutoComplete:Hide()