diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index 9565d6e88a..f07f50f287 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -45,7 +45,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="126"/>
+        <location filename="src/ui/ChatWindow.cpp" line="128"/>
         <source>day</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -53,7 +53,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="126"/>
+        <location filename="src/ui/ChatWindow.cpp" line="128"/>
         <source>hour</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -61,7 +61,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="126"/>
+        <location filename="src/ui/ChatWindow.cpp" line="128"/>
         <source>minute</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="181"/>
+        <location filename="src/ui/ChatWindow.cpp" line="183"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 22b441d868..c4b7fdcdd6 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1047,8 +1047,8 @@ void Menu::showChat() {
         Application::getInstance()->getWindow()->addDockWidget(Qt::RightDockWidgetArea, _chatWindow = new ChatWindow());
         
     } else {
-        if (!_chatWindow->isVisible()) {
-            _chatWindow->show();
+        if (!_chatWindow->toggleViewAction()->isChecked()) {
+            _chatWindow->toggleViewAction()->trigger();
         }
     }
 }
@@ -1056,8 +1056,8 @@ void Menu::showChat() {
 void Menu::toggleChat() {
 #ifdef HAVE_QXMPP
     _chatAction->setEnabled(XmppClient::getInstance().getXMPPClient().isConnected());
-    if (!_chatAction->isEnabled() && _chatWindow) {
-        _chatWindow->hide();
+    if (!_chatAction->isEnabled() && _chatWindow && _chatWindow->toggleViewAction()->isChecked()) {
+        _chatWindow->toggleViewAction()->trigger();
     }
 #endif
 }
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index b7587f9508..55f32c5c7c 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -41,6 +41,8 @@ ChatWindow::ChatWindow() :
 
     ui->messagePlainTextEdit->installEventFilter(this);
 
+    ui->closeButton->hide();
+    
 #ifdef HAVE_QXMPP
     const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();
     if (xmppClient.isConnected()) {