diff --git a/src/Mod/Measure/Gui/Command.cpp b/src/Mod/Measure/Gui/Command.cpp
index e8d6ba8810a9..03f778c5ed0f 100644
--- a/src/Mod/Measure/Gui/Command.cpp
+++ b/src/Mod/Measure/Gui/Command.cpp
@@ -57,6 +57,7 @@ void StdCmdMeasure::activated(int iMsg)
     Q_UNUSED(iMsg);
 
     Gui::TaskMeasure* task = new Gui::TaskMeasure();
+    task->setDocumentName(this->getDocument()->getName());
     Gui::Control().showDialog(task);
 }
 
diff --git a/src/Mod/Measure/Gui/TaskMeasure.cpp b/src/Mod/Measure/Gui/TaskMeasure.cpp
index a227c31f4e25..d1220d07de4b 100644
--- a/src/Mod/Measure/Gui/TaskMeasure.cpp
+++ b/src/Mod/Measure/Gui/TaskMeasure.cpp
@@ -115,7 +115,7 @@ TaskMeasure::TaskMeasure()
         App::GetApplication().setActiveTransaction("Add Measurement");
     }
 
-
+    setAutoCloseOnDeletedDocument(true);
     // Call invoke method delayed, otherwise the dialog might not be fully initialized
     QTimer::singleShot(0, this, &TaskMeasure::invoke);
 }