diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
index c6aceb82e..03f3008f7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
@@ -250,30 +250,32 @@ void closeWindow(ChatWindow chatWindow)
         synchronized (syncChat)
         {
             ChatPanel activePanel = null;
-
-            for (ChatPanel chatPanel : chatPanels)
+            synchronized (chatPanels) 
             {
-                if (chatPanel.getChatSession() instanceof
-                    AdHocConferenceChatSession)
-                {
-                    AdHocConferenceChatSession adHocSession
-                        = (AdHocConferenceChatSession) chatPanel
-                            .getChatSession();
-
-                    GuiActivator.getUIService().getConferenceChatManager()
-                        .leaveChatRoom(
-                            (AdHocChatRoomWrapper) adHocSession.getDescriptor());
-                }
-
-                if (!chatPanel.isWriteAreaEmpty()
-                    || chatPanel.containsActiveFileTransfers()
-                    || System.currentTimeMillis() - chatWindow
-                    .getLastIncomingMsgTimestamp(chatPanel) < 2 * 1000)
-                {
-                    activePanel = chatPanel;
-                }
+            	for (ChatPanel chatPanel : chatPanels)
+            	{
+            		if (chatPanel.getChatSession() instanceof
+            				AdHocConferenceChatSession)
+            		{
+            			AdHocConferenceChatSession adHocSession
+            			= (AdHocConferenceChatSession) chatPanel
+            			.getChatSession();
+
+            			GuiActivator.getUIService().getConferenceChatManager()
+            			.leaveChatRoom((AdHocChatRoomWrapper) 
+            					adHocSession.getDescriptor());
+            		}
+
+            		if (!chatPanel.isWriteAreaEmpty()
+            				|| chatPanel.containsActiveFileTransfers()
+            				|| System.currentTimeMillis() - chatWindow
+            				.getLastIncomingMsgTimestamp(chatPanel) < 2 * 1000)
+            		{
+            			activePanel = chatPanel;
+            		}
+            	}
             }
-
+            
             if (activePanel == null)
             {
                 this.disposeChatWindow(chatWindow);