diff --git a/packages/ui/src/app/App.stories.tsx b/packages/ui/src/app/App.stories.tsx
index 9374455348..08a6718ea7 100644
--- a/packages/ui/src/app/App.stories.tsx
+++ b/packages/ui/src/app/App.stories.tsx
@@ -579,7 +579,7 @@ const fillMembershipFormValidatorAccounts = async (modal: Container, accounts: s
   expect(await modal.findByText(/^If your validator account/))
   const validatorAccountsContainer = document.getElementsByClassName('validator-accounts')[0]
   const addButton = modal.getByText('Add Validator Account')
-  for (let i = 0; i < accounts.length - 1; i++) {
+  for (let i = 0; i < accounts.length; i++) {
     await userEvent.click(addButton)
   }
   const selectors = validatorAccountsContainer.querySelectorAll('input')
diff --git a/packages/ui/src/memberships/components/SelectValidatorAccounts.tsx b/packages/ui/src/memberships/components/SelectValidatorAccounts.tsx
index 2e4e8e56dc..866a226904 100644
--- a/packages/ui/src/memberships/components/SelectValidatorAccounts.tsx
+++ b/packages/ui/src/memberships/components/SelectValidatorAccounts.tsx
@@ -130,6 +130,7 @@ export const SelectValidatorAccounts = ({ isValidatorAccount, state, onChange }:
                     onClick={() => {
                       RemoveAccount(index)
                     }}
+                    className="remove-button"
                   >
                     <CrossIcon />
                   </ButtonGhost>