diff --git a/platform/bootstrap/src/com/intellij/idea/Main.java b/platform/bootstrap/src/com/intellij/idea/Main.java
index b5ee736cf215..808b6759fbeb 100644
--- a/platform/bootstrap/src/com/intellij/idea/Main.java
+++ b/platform/bootstrap/src/com/intellij/idea/Main.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.Restarter;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
@@ -65,16 +66,9 @@ public class Main {
       }
 
       if (!restarted && restartCode == 0) {
-        try {
-          UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        }
-        catch (Exception ignore) {
-        }
-        JOptionPane.showMessageDialog(null,
-                                      "The application cannot start right away since some critical files have been changed.\n" +
-                                      "Please restart it manually.",
-                                      "Update",
-                                      JOptionPane.INFORMATION_MESSAGE);
+        UIUtil.initDefaultLAF();
+        String msg = "The application cannot start right away since some critical files have been changed.\nPlease restart it manually.";
+        JOptionPane.showMessageDialog(null, msg, "Update", JOptionPane.INFORMATION_MESSAGE);
       }
 
       final int finalRestartCode = restartCode;