diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp
index 30b7f00a8b..3b07bee830 100644
--- a/src/Mod/Surface/Gui/TaskFilling.cpp
+++ b/src/Mod/Surface/Gui/TaskFilling.cpp
@@ -91,13 +91,7 @@ bool ViewProviderFilling::setEdit(int ModNum)
 
 void ViewProviderFilling::unsetEdit(int ModNum)
 {
-    if (ModNum == ViewProvider::Default) {
-        // when pressing ESC make sure to close the dialog
-        QTimer::singleShot(0, &Gui::Control(), SLOT(closeDialog()));
-    }
-    else {
-        PartGui::ViewProviderSpline::unsetEdit(ModNum);
-    }
+    PartGui::ViewProviderSpline::unsetEdit(ModNum);
 }
 
 QIcon ViewProviderFilling::getIcon(void) const
@@ -902,6 +896,11 @@ void TaskFilling::open()
     widget3->open();
 }
 
+void TaskFilling::closed()
+{
+    widget1->reject();
+}
+
 bool TaskFilling::accept()
 {
     bool ok = widget1->accept();
diff --git a/src/Mod/Surface/Gui/TaskFilling.h b/src/Mod/Surface/Gui/TaskFilling.h
index 5d5d825444..c069187adc 100644
--- a/src/Mod/Surface/Gui/TaskFilling.h
+++ b/src/Mod/Surface/Gui/TaskFilling.h
@@ -116,6 +116,7 @@ public:
 
 public:
     void open();
+    void closed();
     bool accept();
     bool reject();