diff --git a/frappe/public/js/form_builder/components/Tabs.vue b/frappe/public/js/form_builder/components/Tabs.vue
index 2f880cf75e..313bf44ace 100644
--- a/frappe/public/js/form_builder/components/Tabs.vue
+++ b/frappe/public/js/form_builder/components/Tabs.vue
@@ -126,7 +126,7 @@ function delete_tab(with_children) {
 					<button
 						class="remove-tab-btn btn btn-xs"
 						:title="__('Remove tab')"
-						@click="remove_tab"
+						@click.stop="remove_tab"
 					>
 						<div v-html="frappe.utils.icon('remove', 'xs')"></div>
 					</button>
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 4a0412bb89..8edb86896f 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -319,7 +319,7 @@ export const useStore = defineStore("form-builder-store", () => {
 
 		// scroll to active tab
 		nextTick(() => {
-			$(".tabs .tab.active")[0].scrollIntoView({
+			$(".tabs .tab.active")[0]?.scrollIntoView({
 				behavior: "smooth",
 				inline: "center",
 				block: "nearest",