Index: src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 4869)
+++ src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(working copy)
@@ -593,11 +593,7 @@
                     osm = mv.getNearestNodeOrWay(p, OsmPrimitive.isSelectablePredicate, true);
                 }
             } else {
-                if (osm instanceof Node) {
-                    cycleList = new LinkedList<OsmPrimitive>(mv.getNearestNodes(p, OsmPrimitive.isSelectablePredicate));
-                } else if (osm instanceof Way) {
-                    cycleList = new LinkedList<OsmPrimitive>(mv.getNearestWays(p, OsmPrimitive.isSelectablePredicate));
-                }
+                cycleList = mv.getAllNearest(p, OsmPrimitive.isSelectablePredicate);
 
                 if (cycleList.size() > 1) {
                     cyclePrims = false;