Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java	(revision 16464)
+++ trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java	(revision 16465)
@@ -72,5 +72,5 @@
         }
 
-        public void prepare(PrimitiveId pid) {
+        void prepare(PrimitiveId pid) {
             zoomToNodeAction.setPrimitiveId(pid);
             zoomToNodeAction.updateEnabledState();
@@ -98,10 +98,7 @@
                 return;
             IPrimitive p = getPrimitiveToZoom();
-            if (p != null) {
-                OsmData<?, ?, ?, ?> ds = MainApplication.getLayerManager().getActiveData();
-                if (ds != null) {
-                    ds.setSelected(p.getPrimitiveId());
-                    AutoScaleAction.autoScale(AutoScaleMode.SELECTION);
-                }
+            if (p != null && p.isSelectable()) {
+                p.getDataSet().setSelected(p);
+                AutoScaleAction.autoScale(AutoScaleMode.SELECTION);
             }
         }