diff --git a/frappe/public/js/form_builder/components/Column.vue b/frappe/public/js/form_builder/components/Column.vue
index dab1ec4c5e..a8f1f84118 100644
--- a/frappe/public/js/form_builder/components/Column.vue
+++ b/frappe/public/js/form_builder/components/Column.vue
@@ -56,6 +56,7 @@ function remove_column() {
 
 	// remove column
 	columns.splice(index, 1);
+	store.selected_field = null;
 }
 
 function move_columns_to_section() {
@@ -104,7 +105,7 @@ function move_columns_to_section() {
 				<button
 					class="btn btn-xs btn-icon"
 					:title="__('Remove Column')"
-					@click="remove_column"
+					@click.stop="remove_column"
 				>
 					<div v-html="frappe.utils.icon('remove', 'sm')"></div>
 				</button>
diff --git a/frappe/public/js/form_builder/components/Field.vue b/frappe/public/js/form_builder/components/Field.vue
index e1938f4d1e..b6301352a3 100644
--- a/frappe/public/js/form_builder/components/Field.vue
+++ b/frappe/public/js/form_builder/components/Field.vue
@@ -19,6 +19,7 @@ function remove_field() {
 	}
 	let index = props.column.fields.indexOf(props.field);
 	props.column.fields.splice(index, 1);
+	store.selected_field = null;
 }
 
 function move_fields_to_column() {
@@ -75,7 +76,7 @@ function move_fields_to_column() {
 					>
 						<div v-html="frappe.utils.icon('move', 'sm')"></div>
 					</button>
-					<button class="btn btn-xs btn-icon" @click="remove_field">
+					<button class="btn btn-xs btn-icon" @click.stop="remove_field">
 						<div v-html="frappe.utils.icon('remove', 'sm')"></div>
 					</button>
 				</div>
diff --git a/frappe/public/js/form_builder/components/Section.vue b/frappe/public/js/form_builder/components/Section.vue
index 0f9da211e0..d23a599fa6 100644
--- a/frappe/public/js/form_builder/components/Section.vue
+++ b/frappe/public/js/form_builder/components/Section.vue
@@ -50,6 +50,7 @@ function remove_section() {
 
 	// remove section
 	sections.splice(index, 1);
+	store.selected_field = null;
 }
 
 function select_section() {
@@ -122,7 +123,7 @@ function move_sections_to_tab() {
 					<button
 						class="btn btn-xs btn-section"
 						:title="__('Remove section')"
-						@click="remove_section"
+						@click.stop="remove_section"
 					>
 						<div v-html="frappe.utils.icon('remove', 'sm')"></div>
 					</button>