Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 12340)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 12341)
@@ -339,14 +339,6 @@
         @Override
         protected void finish() {
-            SwingUtilities.invokeLater(() -> {
-                fireMapPaintSylesUpdated();
-                styles.clearCached();
-
-                // Trigger a repaint of all data layers
-                Main.getLayerManager().getLayers()
-                    .stream()
-                    .filter(layer -> layer instanceof OsmDataLayer)
-                    .forEach(Layer::invalidate);
-            });
+            fireMapPaintSylesUpdated();
+            afterStyleUpdate();
         }
 
@@ -386,6 +378,20 @@
         MapPaintPrefHelper.INSTANCE.put(data);
         fireMapPaintSylesUpdated();
-        styles.clearCached();
-        Main.map.mapView.repaint();
+        afterStyleUpdate();
+    }
+
+    /**
+     * Manually trigger for now. TODO: Move this to a listener
+     */
+    private static void afterStyleUpdate() {
+        SwingUtilities.invokeLater(() -> {
+            styles.clearCached();
+
+            // Trigger a repaint of all data layers
+            Main.getLayerManager().getLayers()
+                .stream()
+                .filter(layer -> layer instanceof OsmDataLayer)
+                .forEach(Layer::invalidate);
+        });
     }
 
@@ -416,6 +422,5 @@
             fireMapPaintSylesUpdated();
         }
-        styles.clearCached();
-        Main.map.mapView.repaint();
+        afterStyleUpdate();
     }
 
@@ -448,8 +453,5 @@
         MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
         fireMapPaintSylesUpdated();
-        styles.clearCached();
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.repaint();
-        }
+        afterStyleUpdate();
     }