Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 13458)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 13462)
@@ -206,5 +206,7 @@
         requiresSaveToFile = newValue;
         if (oldValue != newValue) {
-            propertyChangeSupport.firePropertyChange(REQUIRES_SAVE_TO_DISK_PROP, oldValue, newValue);
+            GuiHelper.runInEDT(() ->
+                propertyChangeSupport.firePropertyChange(REQUIRES_SAVE_TO_DISK_PROP, oldValue, newValue)
+            );
         }
     }
@@ -214,5 +216,7 @@
         requiresUploadToServer = newValue;
         if (oldValue != newValue) {
-            propertyChangeSupport.firePropertyChange(REQUIRES_UPLOAD_TO_SERVER_PROP, oldValue, newValue);
+            GuiHelper.runInEDT(() ->
+                propertyChangeSupport.firePropertyChange(REQUIRES_UPLOAD_TO_SERVER_PROP, oldValue, newValue)
+            );
         }
     }