Index: src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 5104)
+++ src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(working copy)
@@ -190,7 +190,12 @@
         selectedColor =PaintColors.SELECTED.get();
         drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
         drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
-        wayIsFinished = true;
+
+        // determine if selection is suitable to continue drawing. If it
+        // isn't, set wayIsFinished to true to avoid superfluous repaints.
+        determineCurrentBaseNodeAndPreviousNode(getCurrentDataSet().getSelected());
+        wayIsFinished = currentBaseNode == null;
+
         snapHelper.init();
         snapCheckboxMenuItem.getAction().setEnabled(true);