Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 5105)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 5106)
@@ -191,5 +191,10 @@
         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);