Index: src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 14401)
+++ src/org/openstreetmap/josm/gui/NavigatableComponent.java	(working copy)
@@ -1313,11 +1313,9 @@
                 }
                 if (ntref == null && preferredRefs != null) {
                     // prefer ways containing given nodes
-                    for (Node nd: ws.way.getNodes()) {
-                        if (preferredRefs.contains(nd)) {
-                            ntref = ws;
-                            break searchLoop;
-                        }
+                    if (preferredRefs.contains(ws.getFirstNode()) || preferredRefs.contains(ws.getSecondNode())) {
+                        ntref = ws;
+                        break searchLoop;
                     }
                     Collection<OsmPrimitive> wayRefs = ws.way.getReferrers();
                     // prefer member of the given relations