diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index e6463eec6a..51e97c648a 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -1189,6 +1189,8 @@ bool Document::saveAs(void)
             escapedstr = Base::Tools::escapeEncodeFilename(escapedstr);
             Command::doCommand(Command::Doc,"App.getDocument(\"%s\").saveAs(u\"%s\")"
                                            , DocName, escapedstr.c_str());
+            // App::Document::saveAs() may modify the passed file name
+            fi.setFile(QString::fromUtf8(d->_pcDocument->FileName.getValue()));
             setModified(false);
             getMainWindow()->appendRecentFile(fi.filePath());
         }