Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1516)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1517)
@@ -253,5 +253,4 @@
         if(!Main.map.mapView.isDrawableLayer())
             return;
-        wayIsFinished = false;
         computeHelperLine();
         addHighlighting();
@@ -326,4 +325,6 @@
                 Main.ds.setSelected(n);
                 selection = Main.ds.getSelected();
+                // The user explicitly selected a node, so let him continue drawing
+                wayIsFinished = false;
                 return;
             }
@@ -907,5 +908,4 @@
          * Handle special case: Highlighted node == selected node => finish drawing
          */
-
         if(n != null && Main.ds.getSelectedNodes().contains(n)) {
             if(wayIsFinished)