From b62523b7569d99aa105edaa2a063a34d76ae8bb6 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@ahmala.org>
Date: Tue, 24 Jan 2023 18:59:04 +0200
Subject: [PATCH] Remove icon input field from the internal list when removing
 the icon

---
 keepassxc-browser/content/observer-helper.js | 2 ++
 keepassxc-browser/content/ui.js              | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/keepassxc-browser/content/observer-helper.js b/keepassxc-browser/content/observer-helper.js
index dd4aa17..5606f6e 100644
--- a/keepassxc-browser/content/observer-helper.js
+++ b/keepassxc-browser/content/observer-helper.js
@@ -235,6 +235,8 @@ kpxcObserverHelper.handleObserverAdd = async function(target) {
 
         kpxc.prepareCredentials();
     }
+
+    kpxcIcons.deleteHiddenIcons();
 };
 
 // Removes monitored elements
diff --git a/keepassxc-browser/content/ui.js b/keepassxc-browser/content/ui.js
index 89e37d6..c48bb89 100644
--- a/keepassxc-browser/content/ui.js
+++ b/keepassxc-browser/content/ui.js
@@ -167,6 +167,12 @@ kpxcUI.deleteHiddenIcons = function(iconList, attr) {
             icon.removeIcon(attr);
             iconList.splice(index, 1);
             deletedIcons.push(icon.inputField);
+
+            // Delete the input field from detected fields so the icon can be detected again
+            const inputFieldIndex = kpxc.inputs.indexOf(icon.inputField);
+            if (inputFieldIndex >= 0) {
+                kpxc.inputs.splice(inputFieldIndex, 1);
+            }
         }
     }