diff --git a/keepassxc-browser/content/pwgen.js b/keepassxc-browser/content/pwgen.js
index a5dc8fe..9bcb263 100644
--- a/keepassxc-browser/content/pwgen.js
+++ b/keepassxc-browser/content/pwgen.js
@@ -224,7 +224,7 @@ kpxcPasswordDialog.trigger = async function() {
 
 kpxcPasswordDialog.showDialog = function(field, icon) {
     if (!kpxcFields.isVisible(field)) {
-        document.body.removeChild(icon);
+        icon.parentNode.removeChild(icon);
         field.removeAttribute('kpxc-password-field');
         return;
     }
diff --git a/keepassxc-browser/content/username-field.js b/keepassxc-browser/content/username-field.js
index c251104..7af53fe 100644
--- a/keepassxc-browser/content/username-field.js
+++ b/keepassxc-browser/content/username-field.js
@@ -112,7 +112,7 @@ UsernameFieldIcon.prototype.createIcon = function(field) {
 
 const iconClicked = async function(field, icon) {
     if (!kpxcFields.isVisible(field)) {
-        document.body.removeChild(icon);
+        icon.parentNode.removeChild(icon);
         field.removeAttribute('kpxc-username-field');
         return;
     }
diff --git a/keepassxc-browser/css/pwgen.css b/keepassxc-browser/css/pwgen.css
index 6b46d04..86cf3e2 100644
--- a/keepassxc-browser/css/pwgen.css
+++ b/keepassxc-browser/css/pwgen.css
@@ -20,6 +20,7 @@
     margin: .2em 0 .2em 0;
     padding: .4em .2em .4em .8em;
     position: relative;
+    user-select: none;
 }
 
 .kpxc-pwgen-password-row {