diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 5ba2ab367..488cc2e4e 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -939,6 +939,7 @@ void Database::markAsClean()
 void Database::markNonDataChange()
 {
     m_hasNonDataChange = true;
+    emit databaseNonDataChanged();
 }
 
 /**
diff --git a/src/core/Database.h b/src/core/Database.h
index e1bc2ec96..6d8e0403b 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -171,6 +171,7 @@ signals:
     void databaseSaved();
     void databaseDiscarded();
     void databaseFileChanged();
+    void databaseNonDataChanged();
     void tagListUpdated();
 
 private:
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 763024845..530c5e799 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1112,6 +1112,8 @@ void DatabaseWidget::connectDatabaseSignals()
     connect(m_db.data(), &Database::modified, this, &DatabaseWidget::onDatabaseModified);
     connect(m_db.data(), &Database::databaseSaved, this, &DatabaseWidget::databaseSaved);
     connect(m_db.data(), &Database::databaseFileChanged, this, &DatabaseWidget::reloadDatabaseFile);
+    connect(m_db.data(), &Database::databaseNonDataChanged, this, &DatabaseWidget::databaseNonDataChanged);
+    connect(m_db.data(), &Database::databaseNonDataChanged, this, &DatabaseWidget::onDatabaseNonDataChanged);
 }
 
 void DatabaseWidget::loadDatabase(bool accepted)
@@ -1571,6 +1573,14 @@ void DatabaseWidget::triggerAutosaveTimer()
     QMetaObject::invokeMethod(m_autosaveTimer, "timeout");
 }
 
+void DatabaseWidget::onDatabaseNonDataChanged()
+{
+    // Force mark the database modified if we are not auto-saving non-data changes
+    if (!config()->get(Config::AutoSaveNonDataChanges).toBool()) {
+        m_db->markAsModified();
+    }
+}
+
 QString DatabaseWidget::getCurrentSearch()
 {
     return m_lastSearchText;
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 8f6b2a8e2..676bf63a2 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -129,6 +129,7 @@ signals:
     // relayed Database signals
     void databaseFilePathChanged(const QString& oldPath, const QString& newPath);
     void databaseModified();
+    void databaseNonDataChanged();
     void databaseSaved();
     void databaseUnlocked();
     void databaseLockRequested();
@@ -254,6 +255,7 @@ private slots:
     void onEntryChanged(Entry* entry);
     void onGroupChanged();
     void onDatabaseModified();
+    void onDatabaseNonDataChanged();
     void onAutosaveDelayTimeout();
     void connectDatabaseSignals();
     void loadDatabase(bool accepted);
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index de2620990..0890ac4b2 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -442,6 +442,7 @@ MainWindow::MainWindow()
         SIGNAL(currentModeChanged(DatabaseWidget::Mode)), this, SLOT(setMenuActionState(DatabaseWidget::Mode)));
     m_actionMultiplexer.connect(SIGNAL(groupChanged()), this, SLOT(setMenuActionState()));
     m_actionMultiplexer.connect(SIGNAL(entrySelectionChanged()), this, SLOT(setMenuActionState()));
+    m_actionMultiplexer.connect(SIGNAL(databaseNonDataChanged()), this, SLOT(setMenuActionState()));
     m_actionMultiplexer.connect(SIGNAL(groupContextMenuRequested(QPoint)), this, SLOT(showGroupContextMenu(QPoint)));
     m_actionMultiplexer.connect(SIGNAL(entryContextMenuRequested(QPoint)), this, SLOT(showEntryContextMenu(QPoint)));
     m_actionMultiplexer.connect(SIGNAL(groupChanged()), this, SLOT(updateEntryCountLabel()));