diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js
index f2354f4..468c221 100755
--- a/keepassxc-browser/keepassxc-browser.js
+++ b/keepassxc-browser/keepassxc-browser.js
@@ -1231,8 +1231,22 @@ cipObserverHelper.getId = function(target) {
     return target.classList.length === 0 ? target.id : target.classList;
 };
 
-cipObserverHelper.handleObserverAdd = function(target) {
+cipObserverHelper.ignoredElement = function(target) {
+     // Ignore SVG elements
+    if (target.className && (target.nodeName !== 'svg' || target.parentNode.nodeName !== 'svg')) {
+        return true;
+    }
+
+    // Ignore KeePassXC-Browser classes
     if (target.className && (target.className.includes('kpxc') || target.className.includes('ui-helper'))) {
+        return true;
+    }
+
+    return false;
+};
+
+cipObserverHelper.handleObserverAdd = function(target) {
+    if (cipObserverHelper.ignoredElement(target)) {
         return;
     }
 
@@ -1257,7 +1271,7 @@ cipObserverHelper.handleObserverAdd = function(target) {
 };
 
 cipObserverHelper.handleObserverRemove = function(target) {
-    if (target.className && (target.className.includes('kpxc') || target.className.includes('ui-helper'))) {
+    if (cipObserverHelper.ignoredElement(target)) {
         return;
     }