diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 03c1669..1538bba 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -88,12 +88,12 @@ browser.runtime.onMessage.addListener(function(req, sender) {
 });
 
 function _f(fieldId) {
-    const inputs = document.querySelectorAll('input[data-kpxc-id=\'' + fieldId + '\']');
+    const inputs = document.querySelectorAll(`input[data-kpxc-id='${fieldId}']`);
     return inputs.length > 0 ? inputs[0] : null;
 }
 
 function _fs(fieldId) {
-    const inputs = document.querySelectorAll('input[data-kpxc-id=\'' + fieldId + '\'], select[data-kpxc-id=\'' + fieldId + '\']');
+    const inputs = document.querySelectorAll(`input[data-kpxc-id='${fieldId}'], select[data-kpxc-id='${fieldId}']`);
     return inputs.length > 0 ? inputs[0] : null;
 }
 
diff --git a/keepassxc-browser/content/pwgen.js b/keepassxc-browser/content/pwgen.js
index 952b0bc..b84e41b 100644
--- a/keepassxc-browser/content/pwgen.js
+++ b/keepassxc-browser/content/pwgen.js
@@ -267,15 +267,8 @@ kpxcPassword.copy = function(e) {
 kpxcPassword.fill = function(e) {
     e.preventDefault();
 
-    let field = null;
-    const inputs = document.querySelectorAll('input[type=\'password\']');
-    for (const i of inputs) {
-        if (i.getAttribute('data-kpxc-id')) {
-            field = i;
-            break;
-        }
-    }
-
+    // Use the active input field
+    const field = _f(kpxcPassword.dialog.getAttribute('kpxc-pwgen-field-id'));
     if (field) {
         const password = $('.kpxc-pwgen-input');
         if (field.getAttribute('maxlength')) {