diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 70e04b7..1a528fa 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -595,7 +595,7 @@ public abstract class Main {
      */
     public Main() {
         main = this;
-        mainPanel.addAndFireMapFrameListener(new MapFrameListener() {
+        mainPanel.addMapFrameListener(new MapFrameListener() {
             @Override
             public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
                 redoUndoListener.commandChanged(0, 0);
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index 58ebfc2..ea78b8e 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -316,15 +316,6 @@ public class MainApplication extends Main {
 
         initApplicationPreferences();
 
-        // Can only be called after preferences are initialized.
-        // We can move this to MainPanel constructor as soon as noone depends on Main#panel any more.
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override
-            public void run() {
-                mainPanel.updateContent();
-            }
-        });
-
         Policy.setPolicy(new Policy() {
             // Permissions for plug-ins loaded when josm is started via webstart
             private PermissionCollection pc;
@@ -404,6 +395,15 @@ public class MainApplication extends Main {
 
         I18n.setupLanguageFonts();
 
+        // Can only be called after preferences are initialized.
+        // We can move this to MainPanel constructor as soon as noone depends on Main#panel any more.
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override
+            public void run() {
+                mainPanel.updateContent();
+            }
+        });
+
         WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry",
                 args.containsKey(Option.GEOMETRY) ? args.get(Option.GEOMETRY).iterator().next() : null,
                 !args.containsKey(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));