diff --git a/src/Mod/Draft/draftguitools/gui_selectplane.py b/src/Mod/Draft/draftguitools/gui_selectplane.py
index a1c9b34b5b..15850a030f 100644
--- a/src/Mod/Draft/draftguitools/gui_selectplane.py
+++ b/src/Mod/Draft/draftguitools/gui_selectplane.py
@@ -73,6 +73,7 @@ class Draft_SelectPlane:
             App.activeDraftCommand.finish()
 
         App.activeDraftCommand = self
+        self.call = None
 
         # Set variables
         self.wp = WorkingPlane.get_working_plane()
@@ -134,6 +135,7 @@ class Draft_SelectPlane:
         if Gui.Selection.hasSelection():
             if self.wp.align_to_selection(self.offset):
                 Gui.Selection.clearSelection()
+            self.finish()
             return
 
         # Execute the actual task panel delayed to catch possible active Draft command