diff --git a/keepassxc-browser/keepassxc-browser.css b/keepassxc-browser/keepassxc-browser.css
index 6e55f77..b1fb5ff 100644
--- a/keepassxc-browser/keepassxc-browser.css
+++ b/keepassxc-browser/keepassxc-browser.css
@@ -7,6 +7,10 @@
     color: #222222 !important;
 }
 
+.kpxc .ui-menu {
+    z-index: 10000;
+}
+
 .ui-helper-hidden-accessible {
     display: none !important;
 }
diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js
index 5f53381..08eb047 100755
--- a/keepassxc-browser/keepassxc-browser.js
+++ b/keepassxc-browser/keepassxc-browser.js
@@ -194,7 +194,7 @@ cipAutocomplete.onFocus = function(e) {
 
 // Search for isTrusted from jQuery's originalEvent
 cipAutocomplete.isTrusted = function(e) { 
-    for (let f = e.originalEvent; f !== null; f = f.originalEvent) {
+    for (let f = e.originalEvent; f; f = f.originalEvent) {
         if (f.isTrusted !== undefined) {
             return f.isTrusted;
         }