Index: src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1514)
+++ src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(working copy)
@@ -252,7 +252,6 @@
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         if(!Main.map.mapView.isDrawableLayer())
             return;
-        wayIsFinished = false;
         computeHelperLine();
         addHighlighting();
         redrawIfRequired();
@@ -325,6 +324,8 @@
                 // have to switch modes)
                 Main.ds.setSelected(n);
                 selection = Main.ds.getSelected();
+                // The user explicitly selected a node, so let him continue drawing
+                wayIsFinished = false;
                 return;
             }
         } else {
@@ -906,7 +907,6 @@
         /*
          * Handle special case: Highlighted node == selected node => finish drawing
          */
-
         if(n != null && Main.ds.getSelectedNodes().contains(n)) {
             if(wayIsFinished)
                 rv = tr("Select node under cursor.");