diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
index 3c48aa3857835e570c56136f7ffb654056ab974f..7b519c2d11b5baa9442ac30c5bed61acd6042cfe 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
@@ -68,7 +68,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     </EventHandlers>
     
     <EventHandlers type="{StopChatModuleEvent.STOP_CHAT_MODULE_EVENT}">        
-      <MethodInvoker generator="{ChatEventMapDelegate}" method="closeChatWindow" />
+      <MethodInvoker generator="{ChatEventMapDelegate}" method="closeChatWindows" />
     </EventHandlers>
     
     <EventHandlers type="{EventConstants.SEND_PUBLIC_CHAT_REQ}">        
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMapDelegate.as
index 9b9861a4d9e7320c45fa82c03a8fd46ed7f824f8..5f587c6bdf2c9c52c92754e65f02f91e27036143 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMapDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMapDelegate.as
@@ -156,11 +156,12 @@ package org.bigbluebutton.modules.chat.maps {
       globalDispatcher.dispatchEvent(event);		
     }
     
-    public function closeChatWindow():void { //Never called
-      var event:CloseWindowEvent = new CloseWindowEvent(CloseWindowEvent.CLOSE_WINDOW_EVENT);
-      //	event.window = _chatWindow;
-      globalDispatcher.dispatchEvent(event);
-      
+    public function closeChatWindows():void { //Never called
+      for each (var window:ChatWindow in _windows) {
+        var event:CloseWindowEvent = new CloseWindowEvent(CloseWindowEvent.CLOSE_WINDOW_EVENT);
+        event.window = window;
+        globalDispatcher.dispatchEvent(event);
+      }
     }
   }
 }
\ No newline at end of file