diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
index d1a64b529..a8425aae1 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
@@ -77,11 +77,8 @@ void DatabaseSettingsWidgetMasterKey::load(QSharedPointer<Database> db)
         // database has no key, we are about to add a new one
         m_passwordEditWidget->changeVisiblePage(KeyComponentWidget::Page::Edit);
         m_passwordEditWidget->setPasswordVisible(true);
-        m_isDirty = true;
-        return;
     }
 
-    bool isDirty = false;
     bool hasAdditionalKeys = false;
     for (const auto& key : m_db->key()->keys()) {
         if (key->uuid() == PasswordKey::UUID) {
@@ -103,7 +100,9 @@ void DatabaseSettingsWidgetMasterKey::load(QSharedPointer<Database> db)
 
     setAdditionalKeyOptionsVisible(hasAdditionalKeys);
 
-    m_isDirty = isDirty;
+    connect(m_passwordEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
+    connect(m_keyFileEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
+    connect(m_yubiKeyEditWidget->findChild<QPushButton*>("removeButton"), SIGNAL(clicked()), SLOT(markDirty()));
 }
 
 void DatabaseSettingsWidgetMasterKey::initialize()
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 9a4c1600f..74a1fcd36 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -993,6 +993,13 @@ void EditEntryWidget::clear()
 {
     m_entry = nullptr;
     m_db.reset();
+
+    m_mainUi->titleEdit->setText("");
+    m_mainUi->passwordEdit->setText("");
+    m_mainUi->passwordRepeatEdit->setText("");
+    m_mainUi->urlEdit->setText("");
+    m_mainUi->notesEdit->clear();
+
     m_entryAttributes->clear();
     m_advancedUi->attachmentsWidget->clearAttachments();
     m_autoTypeAssoc->clear();
diff --git a/src/gui/masterkey/PasswordEditWidget.cpp b/src/gui/masterkey/PasswordEditWidget.cpp
index 86d629da0..6f6cf4d99 100644
--- a/src/gui/masterkey/PasswordEditWidget.cpp
+++ b/src/gui/masterkey/PasswordEditWidget.cpp
@@ -92,6 +92,15 @@ void PasswordEditWidget::initComponentEditWidget(QWidget* widget)
     m_compUi->enterPasswordEdit->setFocus();
 }
 
+void PasswordEditWidget::hideEvent(QHideEvent* event)
+{
+    if (!isVisible() && m_compUi->enterPasswordEdit) {
+        m_compUi->enterPasswordEdit->setText("");
+    }
+
+    QWidget::hideEvent(event);
+}
+
 bool PasswordEditWidget::validate(QString& errorMessage) const
 {
     if (m_compUi->enterPasswordEdit->text() != m_compUi->repeatPasswordEdit->text()) {
diff --git a/src/gui/masterkey/PasswordEditWidget.h b/src/gui/masterkey/PasswordEditWidget.h
index 9f3eb75ce..57c225c1f 100644
--- a/src/gui/masterkey/PasswordEditWidget.h
+++ b/src/gui/masterkey/PasswordEditWidget.h
@@ -44,6 +44,7 @@ public:
 protected:
     QWidget* componentEditWidget() override;
     void initComponentEditWidget(QWidget* widget) override;
+    void hideEvent(QHideEvent* event) override;
 
 private slots:
     void showPasswordGenerator();