From 00f70716575e7e9528719c5f3504d574b93e8078 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Tue, 12 Jun 2018 12:59:25 +0300
Subject: [PATCH] Improvements to isSearchField

---
 keepassxc-browser/keepassxc-browser.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js
index 0fdfb45..671e874 100755
--- a/keepassxc-browser/keepassxc-browser.js
+++ b/keepassxc-browser/keepassxc-browser.js
@@ -864,11 +864,22 @@ cipFields.isSearchField = function(target) {
         }
     }
 
-    // Check form action
+    // Check closest form
     const closestForm = target.closest('form');
-    const formAction = closestForm ? closestForm.getAttribute('action') : null;
-    if (formAction && formAction.includes('search')) {
-        return true;
+    if (closestForm) {
+        // Check form action
+        const formAction = closestForm.getAttribute('action');
+        if (formAction && formAction.includes('search')) {
+            return true;
+        }
+
+        // Check form class and id
+        const closestFormId = closestForm.getAttribute('id');
+        const closestFormClass = closestForm.className;
+        if (closestFormClass && (closestForm.className.toLowerCase().includes('search') || 
+            (closestFormId && closestFormId.toLowerCase().includes('search')))) {
+            return true;
+        }
     }
 
     // Check parent elements for role="search"