diff --git a/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
index 11b20667..9c2be38e 100644
--- a/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/ChatServerView.groovy
@@ -80,7 +80,10 @@ class ChatServerView {
     }
 
     def closeTab = {
-        if (model.buttonText == "Disconnect")
+        if (model.host == model.core.me) {
+            mvcGroup.parentGroup.controller.stopChatServer()
+        }
+        else if (model.buttonText == "Disconnect")
             controller.disconnect()
         int index = parent.indexOfComponent(pane)
         parent.removeTabAt(index)