1 files changed, 4 insertions, 1 deletions
diff --git a/src/frontend/displaywindow/cplainwritewindow.cpp b/src/frontend/displaywindow/cplainwritewindow.cpp
index b51339e..8d960db 100644
--- a/src/frontend/displaywindow/cplainwritewindow.cpp
+++ b/src/frontend/displaywindow/cplainwritewindow.cpp
@@ -263,8 +263,10 @@ void CPlainWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
 }
 
 void CPlainWriteWindow::saveCurrentText() {
-    if (key())
+    if (key()) {
+        m_writeDisplay->setModified(false);
         saveCurrentText(key()->key());
+    }
 }
 
 
@@ -303,6 +305,7 @@ void CPlainWriteWindow::beforeKeyChange() {
 
         switch (message::showQuestion( this, tr("Save Text?"), tr("Save changed text?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) ) {
             case QMessageBox::Yes: { //save the changes
+                m_writeDisplay->setModified(false); // Do before saveCurrentText to prevent recursion
                 saveCurrentText( thisWindowsKey );
                 break;
             }