diff --git a/src/java/davmail/ui/AcceptCertificateDialog.java b/src/java/davmail/ui/AcceptCertificateDialog.java
index 586a6a1b..c33484c0 100644
--- a/src/java/davmail/ui/AcceptCertificateDialog.java
+++ b/src/java/davmail/ui/AcceptCertificateDialog.java
@@ -116,14 +116,8 @@ public class AcceptCertificateDialog extends JDialog {
                 getSize().width / 2,
                 getToolkit().getScreenSize().height / 2 -
                         getSize().height / 2);
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                setVisible(true);
-                toFront();
-                repaint();
-                requestFocus();
-            }
-        });
+	setAlwaysOnTop(true);
+        setVisible(true);
     }
 
     protected JPanel getButtonPanel() {
diff --git a/src/java/davmail/ui/NotificationDialog.java b/src/java/davmail/ui/NotificationDialog.java
index d51b1359..fb3d38ea 100644
--- a/src/java/davmail/ui/NotificationDialog.java
+++ b/src/java/davmail/ui/NotificationDialog.java
@@ -132,17 +132,8 @@ public class NotificationDialog extends JDialog {
                 getSize().width / 2,
                 getToolkit().getScreenSize().height / 2 -
                         getSize().height / 2);
-        bodyField.requestFocus();
-
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                setVisible(true);
-                toFront();
-                repaint();
-                requestFocus();
-            }
-        });
-
+	setAlwaysOnTop(true);
+        setVisible(true);
     }
 
     protected JPanel getRecipientsPanel() {
diff --git a/src/java/davmail/ui/PasswordPromptDialog.java b/src/java/davmail/ui/PasswordPromptDialog.java
index ac4b54a1..cb7cee3c 100644
--- a/src/java/davmail/ui/PasswordPromptDialog.java
+++ b/src/java/davmail/ui/PasswordPromptDialog.java
@@ -109,14 +109,8 @@ public class PasswordPromptDialog extends JDialog {
                 getSize().width / 2,
                 getToolkit().getScreenSize().height / 2 -
                         getSize().height / 2);
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                setVisible(true);
-                toFront();
-                repaint();
-                requestFocus();
-            }
-        });
+	setAlwaysOnTop(true);
+        setVisible(true);
     }
 
     protected JPanel getButtonPanel() {
diff --git a/src/java/davmail/ui/SelectCertificateDialog.java b/src/java/davmail/ui/SelectCertificateDialog.java
index e1e51163..d20bb0bd 100644
--- a/src/java/davmail/ui/SelectCertificateDialog.java
+++ b/src/java/davmail/ui/SelectCertificateDialog.java
@@ -82,14 +82,8 @@ public class SelectCertificateDialog extends JDialog {
                 getSize().width / 2,
                 getToolkit().getScreenSize().height / 2 -
                         getSize().height / 2);
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                setVisible(true);
-                toFront();
-                repaint();
-                requestFocus();
-            }
-        });
+	setAlwaysOnTop(true);
+        setVisible(true);
     }
 
     protected JPanel getButtonPanel() {
diff --git a/src/java/davmail/ui/tray/FrameGatewayTray.java b/src/java/davmail/ui/tray/FrameGatewayTray.java
index 1f2f19f9..dbd8b9d7 100644
--- a/src/java/davmail/ui/tray/FrameGatewayTray.java
+++ b/src/java/davmail/ui/tray/FrameGatewayTray.java
@@ -159,6 +159,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface {
                 settingsFrame.reload();
                 settingsFrame.setVisible(true);
                 settingsFrame.toFront();
+                settingsFrame.repaint();
                 settingsFrame.requestFocus();
             }
         });
@@ -317,6 +318,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface {
         if (Settings.isFirstStart()) {
             settingsFrame.setVisible(true);
             settingsFrame.toFront();
+            settingsFrame.repaint();
             settingsFrame.requestFocus();
         }
     }