diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8fc01a2..27a2c02 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -657,7 +657,8 @@ void KeepassMainWindow::setStateFileOpen(bool IsOpen){
 
 void KeepassMainWindow::setStateFileModified(bool mod){
 	if (config->autoSaveChange() && mod && db->file()){
-		OnFileSave();
+		if (OnFileSave())
+			return; // return on success, so we don't set the state to modified
 	}
 	
 	ModFlag=mod;