diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 5eedfc785..5cb68d467 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -1007,6 +1007,7 @@ class DraftToolBar:
                 if callback:
                     callback()
                 return True
+        FreeCADGui.Control.closeDialog()
         panel = TaskPanel(extra,callback)
         FreeCADGui.Control.showDialog(panel)