diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 310f141d7f..64e572fe74 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1730,7 +1730,7 @@ bool DatabaseWidget::currentEntryHasSshKey()
         return false;
     }
 
-    return KeeAgentSettings::inEntry(currentEntry);
+    return KeeAgentSettings::inEntryAttachments(currentEntry->attachments());
 }
 #endif
 
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 1b202bf080..04827b9613 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -532,22 +532,24 @@ void EditEntryWidget::setupSSHAgent()
     addPage(tr("SSH Agent"), Resources::instance()->icon("utilities-terminal"), m_sshAgentWidget);
 }
 
-void EditEntryWidget::updateSSHAgent()
+void EditEntryWidget::setSSHAgentSettings()
 {
-    KeeAgentSettings settings;
-    settings.fromEntry(m_entry);
-
-    m_sshAgentUi->addKeyToAgentCheckBox->setChecked(settings.addAtDatabaseOpen());
-    m_sshAgentUi->removeKeyFromAgentCheckBox->setChecked(settings.removeAtDatabaseClose());
-    m_sshAgentUi->requireUserConfirmationCheckBox->setChecked(settings.useConfirmConstraintWhenAdding());
-    m_sshAgentUi->lifetimeCheckBox->setChecked(settings.useLifetimeConstraintWhenAdding());
-    m_sshAgentUi->lifetimeSpinBox->setValue(settings.lifetimeConstraintDuration());
+    m_sshAgentUi->addKeyToAgentCheckBox->setChecked(m_sshAgentSettings.addAtDatabaseOpen());
+    m_sshAgentUi->removeKeyFromAgentCheckBox->setChecked(m_sshAgentSettings.removeAtDatabaseClose());
+    m_sshAgentUi->requireUserConfirmationCheckBox->setChecked(m_sshAgentSettings.useConfirmConstraintWhenAdding());
+    m_sshAgentUi->lifetimeCheckBox->setChecked(m_sshAgentSettings.useLifetimeConstraintWhenAdding());
+    m_sshAgentUi->lifetimeSpinBox->setValue(m_sshAgentSettings.lifetimeConstraintDuration());
     m_sshAgentUi->attachmentComboBox->clear();
     m_sshAgentUi->addToAgentButton->setEnabled(false);
     m_sshAgentUi->removeFromAgentButton->setEnabled(false);
     m_sshAgentUi->copyToClipboardButton->setEnabled(false);
+}
 
-    m_sshAgentSettings = settings;
+void EditEntryWidget::updateSSHAgent()
+{
+    m_sshAgentSettings.reset();
+    m_sshAgentSettings.fromEntry(m_entry);
+    setSSHAgentSettings();
 
     updateSSHAgentAttachments();
 }
@@ -560,6 +562,13 @@ void EditEntryWidget::updateSSHAgentAttachment()
 
 void EditEntryWidget::updateSSHAgentAttachments()
 {
+    // detect if KeeAgent.settings was removed by hand and reset settings
+    if (m_entry && KeeAgentSettings::inEntryAttachments(m_entry->attachments())
+        && !KeeAgentSettings::inEntryAttachments(m_advancedUi->attachmentsWidget->entryAttachments())) {
+        m_sshAgentSettings.reset();
+        setSSHAgentSettings();
+    }
+
     m_sshAgentUi->attachmentComboBox->clear();
     m_sshAgentUi->attachmentComboBox->addItem("");
 
diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index e0a67b5eac..ea630d7ebe 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -111,6 +111,7 @@ private slots:
     void pickColor();
 #ifdef WITH_XC_SSHAGENT
     void toKeeAgentSettings(KeeAgentSettings& settings) const;
+    void setSSHAgentSettings();
     void updateSSHAgent();
     void updateSSHAgentAttachment();
     void updateSSHAgentAttachments();
diff --git a/src/sshagent/KeeAgentSettings.cpp b/src/sshagent/KeeAgentSettings.cpp
index 71265dfea2..e51b353962 100644
--- a/src/sshagent/KeeAgentSettings.cpp
+++ b/src/sshagent/KeeAgentSettings.cpp
@@ -50,6 +50,15 @@ bool KeeAgentSettings::isDefault() const
     return (*this == defaultSettings);
 }
 
+/**
+ * Reset this instance to default settings
+ */
+void KeeAgentSettings::reset()
+{
+    KeeAgentSettings defaultSettings;
+    *this = defaultSettings;
+}
+
 /**
  * Get last error as a QString.
  *
@@ -300,14 +309,14 @@ QByteArray KeeAgentSettings::toXml() const
 }
 
 /**
- * Check if an entry has KeeAgent settings configured
+ * Check if entry attachments have KeeAgent settings configured
  *
- * @param entry Entry to check the attachment
+ * @param attachments EntryAttachments to check the key
  * @return true if XML document exists
  */
-bool KeeAgentSettings::inEntry(const Entry* entry)
+bool KeeAgentSettings::inEntryAttachments(const EntryAttachments* attachments)
 {
-    return entry->attachments()->hasKey("KeeAgent.settings");
+    return attachments->hasKey("KeeAgent.settings");
 }
 
 /**
diff --git a/src/sshagent/KeeAgentSettings.h b/src/sshagent/KeeAgentSettings.h
index 3be7800556..6ad84da2c2 100644
--- a/src/sshagent/KeeAgentSettings.h
+++ b/src/sshagent/KeeAgentSettings.h
@@ -30,11 +30,12 @@ class KeeAgentSettings
     bool operator==(const KeeAgentSettings& other) const;
     bool operator!=(const KeeAgentSettings& other) const;
     bool isDefault() const;
+    void reset();
 
     bool fromXml(const QByteArray& ba);
     QByteArray toXml() const;
 
-    static bool inEntry(const Entry* entry);
+    static bool inEntryAttachments(const EntryAttachments* attachments);
     bool fromEntry(const Entry* entry);
     void toEntry(Entry* entry) const;
     bool keyConfigured() const;