Index: src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(Revision 1985)
+++ src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(Arbeitskopie)
@@ -339,7 +339,7 @@
 
         if (n != null) {
             // user clicked on node
-            if (selection.isEmpty()) {
+            if (selection.isEmpty() || wayIsFinished) {
                 // select the clicked node and do nothing else
                 // (this is just a convenience option so that people don't
                 // have to switch modes)