diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue
index 970dc3fbb4..55f193e32b 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue
@@ -5,17 +5,17 @@
             {{ $__("Edit vendor #%s").format(vendor.id) }}
         </h1>
         <h1 v-else>{{ $__("Add vendor") }}</h1>
+        <Toolbar :sticky="true">
+            <ButtonSubmit :text="$__('Save')" icon="save" />
+            <ToolbarButton
+                :to="{ name: 'VendorList' }"
+                :title="$__('Cancel')"
+                icon="times"
+                cssClass="btn btn-link"
+            >
+            </ToolbarButton>
+        </Toolbar>
         <form @submit="onSubmit($event)" id="add_vendor">
-            <Toolbar :sticky="true">
-                <ButtonSubmit :text="$__('Save')" icon="save" />
-                <ToolbarButton
-                    :to="{ name: 'VendorList' }"
-                    :title="$__('Cancel')"
-                    icon="times"
-                    cssClass="btn btn-link"
-                >
-                </ToolbarButton>
-            </Toolbar>
             <VendorDetails :vendor="vendor" />
             <VendorContacts :vendor="vendor" />
             <VendorInterfaces :vendor="vendor" />
diff --git a/t/cypress/integration/Acquisitions/Vendors_spec.ts b/t/cypress/integration/Acquisitions/Vendors_spec.ts
index b82e30f071..2962946014 100644
--- a/t/cypress/integration/Acquisitions/Vendors_spec.ts
+++ b/t/cypress/integration/Acquisitions/Vendors_spec.ts
@@ -35,7 +35,7 @@ describe("Vendor CRUD operations", () => {
         // Click the button in the toolbar
         cy.visit("/cgi-bin/koha/acquisition/vendors");
         cy.contains("New vendor").click();
-        cy.get("#vendor_add h1").contains("Add vendor");
+        cy.get("h1").contains("Add vendor");
 
         // Fill in the form for normal attributes
         cy.get("#vendor_add").contains("Submit").click();
@@ -140,7 +140,7 @@ describe("Vendor CRUD operations", () => {
         cy.get("#vendors_list table tbody tr:first").contains("Edit").click();
         cy.wait("@get-vendor");
         cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#vendor_add h1").contains("Edit vendor");
+        cy.get("h1").contains("Edit vendor");
 
         // Form has been correctly filled in
         cy.get("#vendor_name").should("have.value", vendor.name);