diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 734dc3f2e..0503531ab 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -322,17 +322,18 @@ bool DatabaseTabWidget::closeAllDatabases()
 bool DatabaseTabWidget::saveDatabase(Database* db)
 {
     DatabaseManagerStruct& dbStruct = m_dbList[db];
-    // temporarily disable autoreload
-    dbStruct.dbWidget->ignoreNextAutoreload();
 
     if (dbStruct.saveToFilename) {
         QSaveFile saveFile(dbStruct.canonicalFilePath);
         if (saveFile.open(QIODevice::WriteOnly)) {
             // write the database to the file
+            dbStruct.dbWidget->blockAutoReload(true);
             m_writer.writeDatabase(&saveFile, db);
+            dbStruct.dbWidget->blockAutoReload(false);
+
             if (m_writer.hasError()) {
-                Q_EMIT messageTab(tr("Writing the database failed.").append("\n")
-                .append(m_writer.errorString()), MessageWidget::Error);
+                emit messageTab(tr("Writing the database failed.").append("\n")
+                                .append(m_writer.errorString()), MessageWidget::Error);
                 return false;
             }
 
@@ -341,22 +342,19 @@ bool DatabaseTabWidget::saveDatabase(Database* db)
                 dbStruct.modified = false;
                 dbStruct.dbWidget->databaseSaved();
                 updateTabName(db);
-                Q_EMIT messageDismissTab();
+                emit messageDismissTab();
                 return true;
-            }
-            else {
-                Q_EMIT messageTab(tr("Writing the database failed.").append("\n")
-                    .append(saveFile.errorString()), MessageWidget::Error);
+            } else {
+                emit messageTab(tr("Writing the database failed.").append("\n")
+                                .append(saveFile.errorString()), MessageWidget::Error);
                 return false;
             }
-        }
-        else {
-            Q_EMIT messageTab(tr("Writing the database failed.").append("\n")
-            .append(saveFile.errorString()), MessageWidget::Error);
+        } else {
+            emit messageTab(tr("Writing the database failed.").append("\n")
+                            .append(saveFile.errorString()), MessageWidget::Error);
             return false;
         }
-    }
-    else {
+    } else {
         return saveDatabaseAs(db);
     }
 }
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index a67646ef1..9af79f777 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -168,14 +168,14 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
 	connect(m_unlockDatabaseDialog, SIGNAL(unlockDone(bool)), SLOT(unlockDatabase(bool)));
     connect(&m_fileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(onWatchedFileChanged()));
     connect(&m_fileWatchTimer, SIGNAL(timeout()), this, SLOT(reloadDatabaseFile()));
-    connect(&m_ignoreWatchTimer, SIGNAL(timeout()), this, SLOT(onWatchedFileChanged()));
+    connect(&m_fileWatchUnblockTimer, SIGNAL(timeout()), this, SLOT(unblockAutoReload()));
     connect(this, SIGNAL(currentChanged(int)), this, SLOT(emitCurrentModeChanged()));
 
     m_databaseModified = false;
 
     m_fileWatchTimer.setSingleShot(true);
-    m_ignoreWatchTimer.setSingleShot(true);
-    m_ignoreNextAutoreload = false;
+    m_fileWatchUnblockTimer.setSingleShot(true);
+    m_ignoreAutoReload = false;
 
     m_searchCaseSensitive = false;
 
@@ -1001,7 +1001,7 @@ void DatabaseWidget::lock()
 
 void DatabaseWidget::updateFilename(const QString& fileName)
 {
-    if (! m_filename.isEmpty()) {
+    if (!m_filename.isEmpty()) {
         m_fileWatcher.removePath(m_filename);
     }
 
@@ -1009,26 +1009,31 @@ void DatabaseWidget::updateFilename(const QString& fileName)
     m_filename = fileName;
 }
 
-void DatabaseWidget::ignoreNextAutoreload()
+void DatabaseWidget::blockAutoReload(bool block)
 {
-    m_ignoreNextAutoreload = true;
-    m_ignoreWatchTimer.start(100);
+    if (block) {
+        m_ignoreAutoReload = true;
+        m_fileWatchTimer.stop();
+    } else {
+        m_fileWatchUnblockTimer.start(500);
+    }
+}
+
+void DatabaseWidget::unblockAutoReload()
+{
+    m_ignoreAutoReload = false;
+    updateFilename(m_filename);
 }
 
 void DatabaseWidget::onWatchedFileChanged()
 {
-    if (m_ignoreNextAutoreload) {
-        // Reset the watch
-        m_ignoreNextAutoreload = false;
-        m_ignoreWatchTimer.stop();
-        m_fileWatcher.addPath(m_filename);
+    if (m_ignoreAutoReload) {
+        return;
     }
-    else {
-        if (m_fileWatchTimer.isActive())
-            return;
+    if (m_fileWatchTimer.isActive())
+        return;
 
-        m_fileWatchTimer.start(500);
-    }
+    m_fileWatchTimer.start(500);
 }
 
 void DatabaseWidget::reloadDatabaseFile()
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 78b6131de..6e9462508 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -98,9 +98,9 @@ public:
     EntryView* entryView();
     void showUnlockDialog();
     void closeUnlockDialog();
-    void ignoreNextAutoreload();
+    void blockAutoReload(bool block = true);
 
-Q_SIGNALS:
+signals:
     void closeRequest();
     void currentModeChanged(DatabaseWidget::Mode mode);
     void groupChanged();
@@ -118,7 +118,7 @@ Q_SIGNALS:
     void entryColumnSizesChanged();
     void updateSearch(QString text);
 
-public Q_SLOTS:
+public slots:
     void createEntry();
     void cloneEntry();
     void deleteEntries();
@@ -154,7 +154,7 @@ public Q_SLOTS:
     void showMessage(const QString& text, MessageWidget::MessageType type);
     void hideMessage();
 
-private Q_SLOTS:
+private slots:
     void entryActivationSignalReceived(Entry* entry, EntryModel::ModelColumn column);
     void switchBackToEntryEdit();
     void switchToHistoryView(Entry* entry);
@@ -172,6 +172,7 @@ private Q_SLOTS:
     void onWatchedFileChanged();
     void reloadDatabaseFile();
     void restoreGroupEntryFocus(Uuid groupUuid, Uuid EntryUuid);
+    void unblockAutoReload();
 
 private:
     void setClipboardTextAndMinimize(const QString& text);
@@ -209,8 +210,8 @@ private:
     // Autoreload
     QFileSystemWatcher m_fileWatcher;
     QTimer m_fileWatchTimer;
-    bool m_ignoreNextAutoreload;
-    QTimer m_ignoreWatchTimer;
+    QTimer m_fileWatchUnblockTimer;
+    bool m_ignoreAutoReload;
     bool m_databaseModified;
 };