diff --git a/src/lib/components/common/Tags/TagInput.svelte b/src/lib/components/common/Tags/TagInput.svelte
index 20b4b6173..9bd2e1757 100644
--- a/src/lib/components/common/Tags/TagInput.svelte
+++ b/src/lib/components/common/Tags/TagInput.svelte
@@ -35,6 +35,7 @@
 				list="tagOptions"
 				on:keydown={(event) => {
 					if (event.key === 'Enter') {
+						event.preventDefault();
 						addTagHandler();
 					}
 				}}
diff --git a/src/lib/components/common/Tags/TagItem.svelte b/src/lib/components/common/Tags/TagItem.svelte
index 8b1a4e6f6..cf2646102 100644
--- a/src/lib/components/common/Tags/TagItem.svelte
+++ b/src/lib/components/common/Tags/TagItem.svelte
@@ -13,6 +13,7 @@
 {#if tag}
 	<Tooltip content={tag.name}>
 		<button
+			type="button"
 			aria-label={$i18n.t('Remove this tag from list')}
 			class="relative group/tags px-1.5 py-[0.5px] gap-0.5 flex justify-between h-fit max-h-fit w-fit items-center rounded-lg bg-gray-500/20 text-gray-700 dark:text-gray-200 transition cursor-pointer"
 			on:click={() => {