Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 13061)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 13062)
@@ -18,4 +18,5 @@
 import java.util.LinkedList;
 import java.util.Optional;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -829,14 +830,17 @@
             }
         }
-        int max = Config.getPref().getInt("warn.move.maxelements", 20), limit = max;
+        Set<Node> nodes = new HashSet<>();
+        int max = Config.getPref().getInt("warn.move.maxelements", 20);
         for (OsmPrimitive osm : getLayerManager().getEditDataSet().getSelected()) {
             if (osm instanceof Way) {
-                limit -= ((Way) osm).getNodes().size();
-            }
-            if (--limit < 0) {
+                nodes.addAll(((Way) osm).getNodes());
+            } else if (osm instanceof Node) {
+                nodes.add((Node) osm);
+            }
+            if (nodes.size() > max) {
                 break;
             }
         }
-        if (limit < 0) {
+        if (nodes.size() > max) {
             final ExtendedDialog ed = new ConfirmMoveDialog();
             ed.setContent(