diff --git a/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
index 92fd6541..11b20667 100644
--- a/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
@@ -80,7 +80,8 @@ class ChatServerView {
     }
 
     def closeTab = {
-        controller.disconnect()
+        if (model.buttonText == "Disconnect")
+            controller.disconnect()
         int index = parent.indexOfComponent(pane)
         parent.removeTabAt(index)
         mvcGroup.destroy()