diff --git a/src/Mod/Fem/Gui/TaskCreateElementSet.h b/src/Mod/Fem/Gui/TaskCreateElementSet.h
index 97a76574c1..d10f1cc994 100644
--- a/src/Mod/Fem/Gui/TaskCreateElementSet.h
+++ b/src/Mod/Fem/Gui/TaskCreateElementSet.h
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef GUI_TASKVIEW_TaskCreateElementSet_H
-#define GUI_TASKVIEW_TaskCreateElementSet_H
+#ifndef FemGui_TaskCreateElementSet_H
+#define FemGui_TaskCreateElementSet_H
 
 #include <Gui/TaskView/TaskView.h>
 #include <Mod/Fem/App/FemSetElementNodesObject.h>
@@ -90,4 +90,4 @@ private:
 
 }  // namespace FemGui
 
-#endif  // GUI_TASKVIEW_TaskCreateElementSet_H
+#endif  // FemGui_TaskCreateElementSet_H
diff --git a/src/Mod/Fem/Gui/TaskDlgCreateElementSet.cpp b/src/Mod/Fem/Gui/TaskDlgCreateElementSet.cpp
index bbc74ea98b..f591ff014f 100644
--- a/src/Mod/Fem/Gui/TaskDlgCreateElementSet.cpp
+++ b/src/Mod/Fem/Gui/TaskDlgCreateElementSet.cpp
@@ -69,9 +69,6 @@ bool TaskDlgCreateElementSet::accept()
     try {
         FemSetElementNodesObject->Elements.setValues(param->elementTempSet);
         FemSetElementNodesObject->recomputeFeature();
-        // Gui::Document* doc = Gui::Application::Instance->activeDocument();
-        // if(doc)
-        //     doc->resetEdit();
         param->MeshViewProvider->resetHighlightNodes();
         FemSetElementNodesObject->Label.setValue(name->name);
         Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
diff --git a/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h b/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h
index a512c66b67..8bb85f08b7 100644
--- a/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h
+++ b/src/Mod/Fem/Gui/TaskDlgCreateElementSet.h
@@ -22,8 +22,8 @@
  ***************************************************************************/
 
 
-#ifndef ROBOTGUI_TaskDlgCreateElementSet_H
-#define ROBOTGUI_TaskDlgCreateElementSet_H
+#ifndef FemGui_TaskDlgCreateElementSet_H
+#define FemGui_TaskDlgCreateElementSet_H
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Mod/Fem/App/FemSetElementNodesObject.h>
@@ -81,4 +81,4 @@ protected:
 
 }  // namespace FemGui
 
-#endif  // ROBOTGUI_TASKDLGSIMULATE_H
+#endif  // FemGui_TaskDlgCreateElementSet_H
diff --git a/src/Mod/Fem/Gui/ViewProviderSetElementNodes.cpp b/src/Mod/Fem/Gui/ViewProviderSetElementNodes.cpp
index d034fd122a..a8f266725f 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetElementNodes.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderSetElementNodes.cpp
@@ -45,9 +45,7 @@ bool ViewProviderSetElementNodes::doubleClicked()
 
 bool ViewProviderSetElementNodes::setEdit(int)
 {
-    Gui::TaskView::TaskDialog* dlg =
-        new TaskDlgCreateElementSet(static_cast<Fem::FemSetElementNodesObject*>(getObject()));
-    Gui::Control().showDialog(dlg);
+    doubleClicked();
     return true;
 }