diff --git a/src/java/davmail/tray/SwtGatewayTray.java b/src/java/davmail/tray/SwtGatewayTray.java
index 75f030c4..98ad0b64 100644
--- a/src/java/davmail/tray/SwtGatewayTray.java
+++ b/src/java/davmail/tray/SwtGatewayTray.java
@@ -178,6 +178,8 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
                                         public void run() {
                                             settingsFrame.reload();
                                             settingsFrame.setVisible(true);
+                                            // workaround for focus on first open
+                                            settingsFrame.setVisible(true);
                                         }
                                     });
                         }
@@ -193,6 +195,8 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
                                         public void run() {
                                             settingsFrame.reload();
                                             settingsFrame.setVisible(true);
+                                            // workaround for focus on first open
+                                            settingsFrame.setVisible(true);
                                         }
                                     });
                         }