diff --git a/src/gui/PasswordWidget.cpp b/src/gui/PasswordWidget.cpp
index 2568ff67b6..2251b79b68 100644
--- a/src/gui/PasswordWidget.cpp
+++ b/src/gui/PasswordWidget.cpp
@@ -262,6 +262,11 @@ void PasswordWidget::checkCapslockState()
     }
 }
 
+void PasswordWidget::setPasswordStrength(const QString& password)
+{
+    updatePasswordStrength(password);
+}
+
 void PasswordWidget::updatePasswordStrength(const QString& password)
 {
     if (password.isEmpty()) {
diff --git a/src/gui/PasswordWidget.h b/src/gui/PasswordWidget.h
index 6049d2908c..df8333ea8b 100644
--- a/src/gui/PasswordWidget.h
+++ b/src/gui/PasswordWidget.h
@@ -57,6 +57,7 @@ public slots:
     void selectAll();
     void setReadOnly(bool state);
     void setEchoMode(QLineEdit::EchoMode mode);
+    void setPasswordStrength(const QString& password);
     void setClearButtonEnabled(bool enabled);
 
 private slots:
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 3a665c5cf4..8ffe6fc845 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -1024,6 +1024,9 @@ void EditEntryWidget::setForms(Entry* entry, bool restore)
     m_mainUi->usernameComboBox->lineEdit()->setText(entry->username());
     m_mainUi->urlEdit->setText(entry->url());
     m_mainUi->passwordEdit->setText(entry->password());
+    if (entry->isAttributeReference("Password")) {
+        m_mainUi->passwordEdit->setPasswordStrength(entry->resolveMultiplePlaceholders(entry->password()));
+    }
     m_mainUi->passwordEdit->setShowPassword(!config()->get(Config::Security_PasswordsHidden).toBool());
     if (!m_history) {
         m_mainUi->passwordEdit->enablePasswordGenerator();
diff --git a/src/gui/tag/TagsEdit.cpp b/src/gui/tag/TagsEdit.cpp
index 1d6bcfa73c..599695d913 100644
--- a/src/gui/tag/TagsEdit.cpp
+++ b/src/gui/tag/TagsEdit.cpp
@@ -411,7 +411,10 @@ struct TagsEdit::Impl
         completer->setCaseSensitivity(Qt::CaseInsensitive);
         connect(completer.get(),
                 static_cast<void (QCompleter::*)(QString const&)>(&QCompleter::activated),
-                [this](QString const& text) { currentText(text); });
+                [this](QString const& text) {
+                    currentText(text);
+                    editNewTag(editing_index + 1);
+                });
     }
 
     QVector<QTextLayout::FormatRange> formatting() const