diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx
index db72a0a04b..ca1c159775 100644
--- a/src/components/structures/auth/SoftLogout.tsx
+++ b/src/components/structures/auth/SoftLogout.tsx
@@ -237,6 +237,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
                 />
                 <AccessibleButton
                     onClick={this.onPasswordLogin}
+                    element="button"
                     kind="primary"
                     type="submit"
                     disabled={this.state.busy}
diff --git a/src/components/views/elements/EditableItemList.tsx b/src/components/views/elements/EditableItemList.tsx
index dc6e6c09a1..269d8a04d5 100644
--- a/src/components/views/elements/EditableItemList.tsx
+++ b/src/components/views/elements/EditableItemList.tsx
@@ -135,6 +135,7 @@ export default class EditableItemList<P = {}> extends React.PureComponent<IProps
                 />
                 <AccessibleButton
                     onClick={this.onItemAdded}
+                    element="button"
                     kind="primary"
                     type="submit"
                     disabled={!this.props.newItem}
diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx
index 8ed6461d0a..fd5905d643 100644
--- a/src/components/views/settings/SetIdServer.tsx
+++ b/src/components/views/settings/SetIdServer.tsx
@@ -407,6 +407,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
                         forceValidity={this.state.error ? false : undefined}
                     />
                     <AccessibleButton
+                        element="button"
                         type="submit"
                         kind="primary_sm"
                         onClick={this.checkIdServer}
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
index 9ad7df31e9..d3a6275c05 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
@@ -268,6 +268,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
                                 onChange={this.onPersonalRuleChanged}
                             />
                             <AccessibleButton
+                                element="button"
                                 type="submit"
                                 kind="primary"
                                 onClick={this.onAddPersonalRule}
@@ -296,6 +297,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
                                 onChange={this.onNewListChanged}
                             />
                             <AccessibleButton
+                                element="button"
                                 type="submit"
                                 kind="primary"
                                 onClick={this.onSubscribeList}