diff --git a/keepassxc-browser/common/sites.js b/keepassxc-browser/common/sites.js
index 0a3e862..5facf06 100644
--- a/keepassxc-browser/common/sites.js
+++ b/keepassxc-browser/common/sites.js
@@ -41,6 +41,7 @@ const PREDEFINED_SITELIST = [
 ];
 
 const kpxcSites = {};
+kpxcSites.ebayUrl = 'https://www.ebay.';
 kpxcSites.googlePasswordFormUrl = 'https://accounts.google.com/signin/v2/challenge/password';
 kpxcSites.googleUrl = 'https://accounts.google.com';
 kpxcSites.savedForm = undefined;
diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 347f683..ea1fd01 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -171,6 +171,13 @@ kpxcForm.getFormSubmitButton = function(form) {
         const buttons = findDiv.getElementsByTagName('button');
         kpxcSites.savedForm = form;
         return buttons.length > 0 ? buttons[0] : undefined;
+    } else if (form.action.startsWith(kpxcSites.ebayUrl)) {
+        // For eBay we must return the first button.
+        for (const i of form.elements) {
+            if (i.type === 'button') {
+                return i;
+            }
+        }
     }
 
     if (action.includes(document.location.origin + document.location.pathname)) {