diff --git a/frontend/src/components/project/views/ViewEditForm.vue b/frontend/src/components/project/views/ViewEditForm.vue
index 40e6c4993..3945d329c 100644
--- a/frontend/src/components/project/views/ViewEditForm.vue
+++ b/frontend/src/components/project/views/ViewEditForm.vue
@@ -121,7 +121,10 @@ function handleBubbleSave() {
 </script>
 
 <template>
-	<form @focusout="handleBubbleSave">
+	<form
+		@focusout="handleBubbleSave"
+		@submit.prevent="save"
+	>
 		<FormField
 			id="title"
 			v-model="view.title"
@@ -271,7 +274,7 @@ function handleBubbleSave() {
 			</XButton>
 			<XButton
 				:loading="loading"
-				@click="save"
+				type="submit"
 			>
 				{{ $t('misc.save') }}
 			</XButton>
diff --git a/frontend/src/views/filters/FilterEdit.vue b/frontend/src/views/filters/FilterEdit.vue
index 60eb83039..38bf8efa3 100644
--- a/frontend/src/views/filters/FilterEdit.vue
+++ b/frontend/src/views/filters/FilterEdit.vue
@@ -40,6 +40,11 @@
 					:change-immediately="true"
 				/>
 			</FormField>
+			<button
+				type="submit"
+				class="is-hidden"
+				tabindex="-1"
+			/>
 		</form>
 	</CreateEdit>
 </template>
diff --git a/frontend/src/views/labels/ListLabels.vue b/frontend/src/views/labels/ListLabels.vue
index 3990d884c..30ae58645 100644
--- a/frontend/src/views/labels/ListLabels.vue
+++ b/frontend/src/views/labels/ListLabels.vue
@@ -80,7 +80,7 @@
 								<XButton
 									:loading="loading"
 									class="is-fullwidth"
-									@click="editLabelSubmit()"
+									type="submit"
 								>
 									{{ $t('misc.save') }}
 								</XButton>
diff --git a/frontend/src/views/teams/EditTeam.vue b/frontend/src/views/teams/EditTeam.vue
index 936ca567e..6a07b9e69 100644
--- a/frontend/src/views/teams/EditTeam.vue
+++ b/frontend/src/views/teams/EditTeam.vue
@@ -41,27 +41,27 @@
 						:placeholder="$t('team.attributes.descriptionPlaceholder')"
 					/>
 				</FormField>
-			</form>
 
-			<div class="field has-addons mbs-4">
-				<div class="control is-fullwidth">
-					<XButton
-						:loading="teamService.loading"
-						class="is-fullwidth"
-						@click="save()"
-					>
-						{{ $t('misc.save') }}
-					</XButton>
+				<div class="field has-addons mbs-4">
+					<div class="control is-fullwidth">
+						<XButton
+							:loading="teamService.loading"
+							class="is-fullwidth"
+							type="submit"
+						>
+							{{ $t('misc.save') }}
+						</XButton>
+					</div>
+					<div class="control">
+						<XButton
+							:loading="teamService.loading"
+							danger
+							icon="trash-alt"
+							@click="showDeleteModal = true"
+						/>
+					</div>
 				</div>
-				<div class="control">
-					<XButton
-						:loading="teamService.loading"
-						danger
-						icon="trash-alt"
-						@click="showDeleteModal = true"
-					/>
-				</div>
-			</div>
+			</form>
 		</Card>
 
 		<Card
diff --git a/frontend/src/views/user/settings/ApiTokens.vue b/frontend/src/views/user/settings/ApiTokens.vue
index b1b4af8c2..6c7f81624 100644
--- a/frontend/src/views/user/settings/ApiTokens.vue
+++ b/frontend/src/views/user/settings/ApiTokens.vue
@@ -375,7 +375,7 @@ function toggleGroupPermissionsFromChild(group: string, checked: boolean) {
 			</p>
 			<XButton
 				:loading="service.loading"
-				@click="createToken"
+				type="submit"
 			>
 				{{ $t('user.settings.apiTokens.createToken') }}
 			</XButton>