Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 4775)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 4776)
@@ -35,4 +35,5 @@
 import javax.swing.JOptionPane;
 
+import javax.swing.SwingUtilities;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
@@ -158,4 +159,5 @@
         DataSet.removeSelectionListener(this);
         Main.unregisterActionShortcut(backspaceShortcut);
+        snapHelper.unsetFixedMode();
 
         removeHighlighting();
@@ -1064,5 +1066,5 @@
     }
 
-    public static class BackSpaceAction extends AbstractAction {
+    public class BackSpaceAction extends AbstractAction {
 
         @Override
@@ -1076,4 +1078,5 @@
                     if (n==null) {
                         n=(Node) p; // found one node
+                        wayIsFinished=false;
                     }  else {
                     // if more than 1 node were affected by previous command,
@@ -1086,6 +1089,6 @@
             // select last added node - maybe we will continue drawing from it 
             if (n!=null) getCurrentDataSet().addSelected(n);
-    }
-    }
+       }
+ }
 
     private class SnapHelper {