Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 14509)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 14510)
@@ -390,4 +390,6 @@
         if (!MainApplication.getMap().mapView.isActiveLayerDrawable())
             return;
+        if (event.getSelection().isEmpty())
+            finishDrawing();
         // Make sure helper line is computed later (causes deadlock in selection event chain otherwise)
         SwingUtilities.invokeLater(() -> {
@@ -1372,4 +1374,5 @@
     public void destroy() {
         super.destroy();
+        finishDrawing();
         snapChangeAction.destroy();
     }