diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 47702e2949..8bc512c080 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -1371,11 +1371,10 @@ Gui::MDIView* Application::editViewOfNode(SoNode* node) const
 
 void Application::setEditDocument(Gui::Document* doc)
 {
-    if (doc == d->editDocument) {
-        return;
-    }
     if (!doc) {
         d->editDocument = nullptr;
+    } else if (doc == d->editDocument) {
+        return;
     }
     for (auto& v : d->documents) {
         v.second->_resetEdit();