diff --git a/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java b/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
index 319528152..5ef0ef114 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
@@ -212,14 +212,16 @@ public void actionPerformed(ActionEvent e)
                 UIService uiService = SystrayActivator.getUIService();
                 ExportedWindow win =
                     uiService.getExportedWindow(ExportedWindow.MAIN_WINDOW);
-                if (!win.isVisible())
+                boolean setIsVisible = !win.isVisible();
+
+                win.setVisible(setIsVisible);
+                configService.setProperty(
+                    "net.java.sip.communicator.impl.systray.showApplication",
+                    Boolean.toString(setIsVisible));
+                if(win.isVisible())
                 {
-                    win.setVisible(true);
-                    configService.setProperty(
-                        "net.java.sip.communicator.impl.systray.showApplication",
-                        Boolean.toString(true));
+                    win.bringToFront();
                 }
-                win.bringToFront();
             }
         });