diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index fda7586d7c..06b7b87b77 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -795,10 +795,6 @@ void DatabaseWidget::switchToView(bool accepted)
         m_newParent = nullptr;
     }
 
-    if (accepted) {
-        showMessage(tr("Entry updated successfully."), MessageWidget::Positive, false, 2000);
-    }
-
     setCurrentWidget(m_mainWidget);
 }
 
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index ac96818011..b180c2a012 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -755,6 +755,8 @@ bool EditEntryWidget::commitEntry()
     }
 #endif
 
+    m_historyModel->setEntries(m_entry->historyItems());
+
     showMessage(tr("Entry updated successfully."), MessageWidget::Positive);
     return true;
 }