diff --git a/packages/loot-design/src/components/common.js b/packages/loot-design/src/components/common.js
index 8b0ab4cedbb6d043b0e2bef5297b464bc6fcb4f3..4ce357e24d053b75a5412783bad2af5f9903c29f 100644
--- a/packages/loot-design/src/components/common.js
+++ b/packages/loot-design/src/components/common.js
@@ -938,10 +938,6 @@ export function ModalButtons({
         style
       ]}
     >
-      {/* Add a dummy button first so that when a user
-          presses "enter" they do a normal submit, instead of
-          activating the back button */}
-      <Button data-hidden={true} style={{ display: 'none' }} />
       {leftContent}
       <View style={{ flex: 1 }} />
       {children}
diff --git a/packages/loot-design/src/components/modals/CreateLocalAccount.js b/packages/loot-design/src/components/modals/CreateLocalAccount.js
index d4f919c02461457f21335678d3b3b5c671bcdbee..c59e06f53dc10121999624d4daa83fd4fff64d98 100644
--- a/packages/loot-design/src/components/modals/CreateLocalAccount.js
+++ b/packages/loot-design/src/components/modals/CreateLocalAccount.js
@@ -146,7 +146,9 @@ function CreateLocalAccount({ modalProps, actions, history }) {
                 )}
 
                 <ModalButtons>
-                  <Button onClick={() => modalProps.onBack()}>Back</Button>
+                  <Button onClick={() => modalProps.onBack()} type="button">
+                    Back
+                  </Button>
                   <Button primary style={{ marginLeft: 10 }}>
                     Create
                   </Button>