diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp
index 21a38997eb..492b219828 100644
--- a/src/Gui/MDIView.cpp
+++ b/src/Gui/MDIView.cpp
@@ -453,7 +453,10 @@ QString MDIView::buildWindowTitle()
     QString windowTitle;
     if (Gui::Document* document = getGuiDocument()) {
         if (document->isModified()) {
-            windowTitle = QString::fromUtf8("* ");
+            getMainWindow()->setWindowModified(TRUE);
+        }
+        else {
+            getMainWindow()->setWindowModified(FALSE);
         }
 
         windowTitle.append(QString::fromUtf8(getAppDocument()->getName()));
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index bd890c5738..b56d7bf065 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -2537,7 +2537,7 @@ void MainWindow::setWindowTitle(const QString& string)
     }
 
     if (!string.isEmpty()) {
-        title = QString::fromUtf8("%1 - %2").arg(string, title);
+        title = QString::fromUtf8("[*] %1 - %2").arg(string, title);
     }
 
     QMainWindow::setWindowTitle(title);