Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 12050)
+++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 12051)
@@ -16,4 +16,6 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -187,5 +189,6 @@
         if (listenToSelectionChange()) {
             selectionChangeAdapter = new SelectionChangeAdapter();
-            DataSet.addSelectionListener(selectionChangeAdapter);
+            SelectionEventManager.getInstance()
+                .addSelectionListener(selectionChangeAdapter, FireMode.IN_EDT_CONSOLIDATED);
         }
         initEnabledState();