diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatFileMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatFileMenu.java
index 89656cec7..a789e0c2a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatFileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatFileMenu.java
@@ -15,6 +15,7 @@
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.skin.*;
 
 /**
@@ -79,10 +80,17 @@ public ChatFileMenu(ChatWindow chatWindow)
     @Override
     public void actionPerformed(ActionEvent e)
     {
-        super.actionPerformed(e);
-
         JMenuItem menuItem = (JMenuItem) e.getSource();
         String itemText = menuItem.getName();
+        
+        if (itemText.equalsIgnoreCase("close"))
+        {
+            this.chatWindow.setVisible(false);
+            this.chatWindow.dispose();
+            return;
+        }
+        
+        super.actionPerformed(e);
 
         if (itemText.equalsIgnoreCase("myChatRooms"))
         {
@@ -120,11 +128,6 @@ else if (itemText.equals("history"))
                     chatSession.getDescriptor(), history);
             }
         }
-        else if (itemText.equalsIgnoreCase("close"))
-        {
-            this.chatWindow.setVisible(false);
-            this.chatWindow.dispose();
-        }
     }
 
     /**