diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 4cccd6d53..066abc4e3 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -42,7 +42,6 @@ Database::Database()
     : m_metadata(new Metadata(this))
     , m_data()
     , m_rootGroup(nullptr)
-    , m_timer(new QTimer(this))
     , m_fileWatcher(new FileWatcher(this))
     , m_emitModified(false)
     , m_uuid(QUuid::createUuid())
@@ -50,12 +49,12 @@ Database::Database()
     setRootGroup(new Group());
     rootGroup()->setUuid(QUuid::createUuid());
     rootGroup()->setName(tr("Root", "Root group name"));
-    m_timer->setSingleShot(true);
+    m_modifiedTimer.setSingleShot(true);
 
     s_uuidMap.insert(m_uuid, this);
 
     connect(m_metadata, SIGNAL(metadataModified()), SLOT(markAsModified()));
-    connect(m_timer, SIGNAL(timeout()), SIGNAL(databaseModified()));
+    connect(&m_modifiedTimer, SIGNAL(timeout()), SIGNAL(databaseModified()));
     connect(this, SIGNAL(databaseOpened()), SLOT(updateCommonUsernames()));
     connect(this, SIGNAL(databaseSaved()), SLOT(updateCommonUsernames()));
     connect(m_fileWatcher, SIGNAL(fileChanged()), SIGNAL(databaseFileChanged()));
@@ -229,6 +228,7 @@ bool Database::saveAs(const QString& filePath, QString* error, bool atomic, bool
     auto& canonicalFilePath = QFileInfo::exists(filePath) ? QFileInfo(filePath).canonicalFilePath() : filePath;
     bool ok = performSave(canonicalFilePath, error, atomic, backup);
     if (ok) {
+        markAsClean();
         setFilePath(filePath);
         m_fileWatcher->start(canonicalFilePath, 30, 1);
     } else {
@@ -343,7 +343,6 @@ bool Database::writeDatabase(QIODevice* device, QString* error)
         return false;
     }
 
-    markAsClean();
     return true;
 }
 
@@ -832,7 +831,7 @@ void Database::emptyRecycleBin()
 void Database::setEmitModified(bool value)
 {
     if (m_emitModified && !value) {
-        m_timer->stop();
+        m_modifiedTimer.stop();
     }
 
     m_emitModified = value;
@@ -846,8 +845,9 @@ bool Database::isModified() const
 void Database::markAsModified()
 {
     m_modified = true;
-    if (m_emitModified) {
-        startModifiedTimer();
+    if (m_emitModified && !m_modifiedTimer.isActive()) {
+        // Small time delay prevents numerous consecutive saves due to repeated signals
+        m_modifiedTimer.start(150);
     }
 }
 
@@ -855,6 +855,7 @@ void Database::markAsClean()
 {
     bool emitSignal = m_modified;
     m_modified = false;
+    m_modifiedTimer.stop();
     if (emitSignal) {
         emit databaseSaved();
     }
@@ -869,18 +870,6 @@ Database* Database::databaseByUuid(const QUuid& uuid)
     return s_uuidMap.value(uuid, nullptr);
 }
 
-void Database::startModifiedTimer()
-{
-    if (!m_emitModified) {
-        return;
-    }
-
-    if (m_timer->isActive()) {
-        m_timer->stop();
-    }
-    m_timer->start(150);
-}
-
 QSharedPointer<const CompositeKey> Database::key() const
 {
     return m_data.key;
diff --git a/src/core/Database.h b/src/core/Database.h
index d5f2092b2..d3d88e7d2 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -21,9 +21,9 @@
 
 #include <QDateTime>
 #include <QHash>
-#include <QObject>
 #include <QPointer>
 #include <QScopedPointer>
+#include <QTimer>
 
 #include "config-keepassx.h"
 #include "crypto/kdf/AesKdf.h"
@@ -37,7 +37,6 @@ enum class EntryReferenceType;
 class FileWatcher;
 class Group;
 class Metadata;
-class QTimer;
 class QIODevice;
 
 struct DeletedObject
@@ -155,9 +154,6 @@ signals:
     void databaseDiscarded();
     void databaseFileChanged();
 
-private slots:
-    void startModifiedTimer();
-
 private:
     struct DatabaseData
     {
@@ -211,7 +207,7 @@ private:
     DatabaseData m_data;
     QPointer<Group> m_rootGroup;
     QList<DeletedObject> m_deletedObjects;
-    QPointer<QTimer> m_timer;
+    QTimer m_modifiedTimer;
     QPointer<FileWatcher> m_fileWatcher;
     bool m_initialized = false;
     bool m_modified = false;
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 29942571c..04fad9a00 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1370,7 +1370,7 @@ bool DatabaseWidget::lock()
     if (m_db->isModified()) {
         bool saved = false;
         // Attempt to save on exit, but don't block locking if it fails
-        if (config()->get("AutoSaveOnExit").toBool()) {
+        if (config()->get("AutoSaveOnExit").toBool() || config()->get("AutoSaveAfterEveryChange").toBool()) {
             saved = save();
         }