diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index c5915ce4e..a4eec98d1 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -1200,6 +1200,11 @@ public void beginShutdown()
     {
         try
         {
+            // close chats, so we do not start removing plugins one by one
+            // when we start to stop the application
+            for(ChatPanel cp : chatWindowManager.getAllChats())
+                chatWindowManager.closeChat(cp);
+
             if (mainFrame != null)
                 mainFrame.dispose();
         }