diff --git a/keepassxc-browser/common/sites.js b/keepassxc-browser/common/sites.js
index 8e0f97d..241c2fd 100644
--- a/keepassxc-browser/common/sites.js
+++ b/keepassxc-browser/common/sites.js
@@ -76,7 +76,8 @@ kpxcSites.exceptionFound = function(identifier) {
     }
 
     if (document.location.origin === 'https://idmsa.apple.com'
-        && [ 'password', 'form-row', 'show-password' ].every(c => identifier.contains(c))) {
+        && ((typeof identifier === 'string' && identifier === 'password_text_field')
+        || [ 'password', 'form-row', 'show-password' ].every(c => identifier.contains(c)))) {
         return true;
     } else if (document.location.origin.startsWith('https://signin.ebay.')
                && (identifier === 'null' || identifier.value === 'null' || identifier === 'pass')) {
diff --git a/keepassxc-browser/content/ui.js b/keepassxc-browser/content/ui.js
index d856b9a..fd4cb71 100644
--- a/keepassxc-browser/content/ui.js
+++ b/keepassxc-browser/content/ui.js
@@ -290,7 +290,7 @@ document.addEventListener('mousemove', function(e) {
         const xPos = e.clientX - kpxcDefine.diffX;
         const yPos = e.clientY - kpxcDefine.diffY;
 
-        if (kpxcDefine.selected !== null) {
+        if (kpxcDefine.selected && kpxcDefine.dialog) {
             kpxcDefine.dialog.style.left = Pixels(xPos);
             kpxcDefine.dialog.style.top = Pixels(yPos);
         }