Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 19166)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 19167)
@@ -20,4 +20,5 @@
 import org.openstreetmap.josm.actions.SelectByInternalPointAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -383,6 +384,7 @@
             }
         } else if (ds != null) {
+            final BBox bbox = nc.getLatLonBounds(bounding).toBBox();
             // nodes
-            for (Node n : ds.getNodes()) {
+            for (Node n : ds.searchNodes(bbox)) {
                 if (n.isSelectable() && selectionResult.contains(nc.getPoint2D(n))) {
                     selection.add(n);
@@ -391,5 +393,5 @@
 
             // ways
-            for (Way w : ds.getWays()) {
+            for (Way w : ds.searchWays(bbox)) {
                 if (!w.isSelectable() || w.isEmpty()) {
                     continue;