diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
index 65c560b8..2dbd161d 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
@@ -164,7 +164,10 @@ class ChatRoomController {
     void handleLeave(Persona p) {
         String toDisplay = DataHelper.formatTime(System.currentTimeMillis()) + " " + p.getHumanReadableName() + " disconnected\n"
         runInsideUIAsync {
-            view.roomTextArea.append(toDisplay)
+            if (model.members.remove(p)) {
+                view.roomTextArea.append(toDisplay)
+                view.membersTable?.model?.fireTableDataChanged()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy b/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
index 9e7e4340..e871c6da 100644
--- a/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
@@ -99,8 +99,8 @@ class ChatServerModel {
     }
     
     private void handleLeave(Persona p) {
-        mvcGroup.childrenGroups.each { 
-            it.controller.handleLeave(p)
+        mvcGroup.childrenGroups.each { k, v ->
+            v.controller.handleLeave(p)
         }
     }
 }
\ No newline at end of file