diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 7125fa9..798b9d1 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -190,8 +190,7 @@ kpxcForm.getFormSubmitButton = function(form) {
 
     // Try to find another button. Select the last one.
     // If any formaction overriding the default action is set, ignore those buttons.
-    const buttons = Array.from(form.querySelectorAll(kpxcForm.formButtonQuery))
-                         .filter(b => b.formAction === document.location.href);
+    const buttons = Array.from(form.querySelectorAll(kpxcForm.formButtonQuery)).filter(b => !b.getAttribute('formAction'));
     if (buttons.length > 0) {
         return buttons[buttons.length - 1];
     }