Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 2350)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 2351)
@@ -345,4 +345,6 @@
                 // (this is just a convenience option so that people don't
                 // have to switch modes)
+                newSelection.clear();
+                newSelection.add(n);
                 getCurrentDataSet().setSelected(n);
                 selection = getCurrentDataSet().getSelected();
@@ -523,4 +525,6 @@
 
                 extendedWay = true;
+                newSelection.clear();
+                newSelection.add(wayToSelect);
                 ds.setSelected(way);
                 ds.fireSelectionChanged();
@@ -540,5 +544,6 @@
                 }
             }
-
+            
+            newSelection.add(n);
             ds.setSelected(n);
             ds.fireSelectionChanged();