diff --git a/frappe/public/js/form_builder/FormBuilder.vue b/frappe/public/js/form_builder/FormBuilder.vue
index 2a1441c51a..c1ab90c4a4 100644
--- a/frappe/public/js/form_builder/FormBuilder.vue
+++ b/frappe/public/js/form_builder/FormBuilder.vue
@@ -166,8 +166,7 @@ onMounted(() => {
 			}
 		}
 
-		:deep([data-has-std-field="false"]),
-		:deep([data-is-custom="1"]) {
+		:deep([data-is-user-generated="1"]) {
 			background-color: var(--yellow-highlight-color);
 		}
 	}
@@ -175,7 +174,7 @@ onMounted(() => {
 	:deep(.preview) {
 		--field-placeholder-color: var(--fg-bg-color);
 
-		.tab, .column, .field, [data-is-custom="1"] {
+		.tab, .column, .field {
 			background-color: var(--fg-color);
 		}
 
diff --git a/frappe/public/js/form_builder/components/Column.vue b/frappe/public/js/form_builder/components/Column.vue
index acb1ff735e..1563d1033e 100644
--- a/frappe/public/js/form_builder/components/Column.vue
+++ b/frappe/public/js/form_builder/components/Column.vue
@@ -148,8 +148,6 @@ function move_columns_to_section() {
 			:style="{ backgroundColor: column.fields.length ? '' : 'var(--field-placeholder-color)' }"
 			v-model="column.fields"
 			group="fields"
-			filter="[data-is-custom='0']"
-			:prevent-on-filter="false"
 			:animation="200"
 			:easing="store.get_animation"
 			item-key="id"
@@ -159,7 +157,7 @@ function move_columns_to_section() {
 				<Field
 					:column="column"
 					:field="element"
-					:data-is-custom="element.df.is_custom_field"
+					:data-is-user-generated="store.is_user_generated_field(element)"
 				/>
 			</template>
 		</draggable>
diff --git a/frappe/public/js/form_builder/components/Section.vue b/frappe/public/js/form_builder/components/Section.vue
index c97fe1e4d8..5131ff25d3 100644
--- a/frappe/public/js/form_builder/components/Section.vue
+++ b/frappe/public/js/form_builder/components/Section.vue
@@ -160,8 +160,6 @@ function move_sections_to_tab() {
 						backgroundColor: section.columns.length ? null : 'var(--field-placeholder-color)'
 					}"
 					v-model="section.columns"
-					filter="[data-has-std-field='true']"
-					:prevent-on-filter="false"
 					group="columns"
 					item-key="id"
 					:animation="200"
@@ -172,8 +170,7 @@ function move_sections_to_tab() {
 						<Column
 							:section="section"
 							:column="element"
-							:data-is-custom="element.df.is_custom_field"
-							:data-has-std-field="store.has_standard_field(element)"
+							:data-is-user-generated="store.is_user_generated_field(element)"
 						/>
 					</template>
 				</draggable>
diff --git a/frappe/public/js/form_builder/components/Tabs.vue b/frappe/public/js/form_builder/components/Tabs.vue
index b587d9d37e..5c233dbd1b 100644
--- a/frappe/public/js/form_builder/components/Tabs.vue
+++ b/frappe/public/js/form_builder/components/Tabs.vue
@@ -114,8 +114,6 @@ function delete_tab(with_children) {
 			class="tabs"
 			v-model="store.form.layout.tabs"
 			group="tabs"
-			filter="[data-has-std-field='true']"
-			:prevent-on-filter="false"
 			:animation="200"
 			:easing="store.get_animation"
 			item-key="id"
@@ -125,8 +123,7 @@ function delete_tab(with_children) {
 				<div
 					:class="['tab', store.form.active_tab == element.df.name ? 'active' : '']"
 					:title="element.df.fieldname"
-					:data-is-custom="element.df.is_custom_field"
-					:data-has-std-field="store.has_standard_field(element)"
+					:data-is-user-generated="store.is_user_generated_field(element)"
 					@click.stop="activate_tab(element)"
 					@dragstart="dragged = true"
 					@dragend="dragged = false"
@@ -174,8 +171,6 @@ function delete_tab(with_children) {
 				class="tab-content-container"
 				v-model="tab.sections"
 				group="sections"
-				filter="[data-has-std-field='true']"
-				:prevent-on-filter="false"
 				:animation="200"
 				:easing="store.get_animation"
 				item-key="id"
@@ -185,8 +180,7 @@ function delete_tab(with_children) {
 					<Section
 						:tab="tab"
 						:section="element"
-						:data-is-custom="element.df.is_custom_field"
-						:data-has-std-field="store.has_standard_field(element)"
+						:data-is-user-generated="store.is_user_generated_field(element)"
 					/>
 				</template>
 			</draggable>
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index b60bdc7919..384baf646d 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -64,6 +64,10 @@ export const useStore = defineStore("form-builder-store", () => {
 		});
 	}
 
+	function is_user_generated_field(field) {
+		return cint(field.df.is_custom_field && !field.df.is_system_generated);
+	}
+
 	async function fetch() {
 		await frappe.model.clear_doc("DocType", doctype.value);
 		await frappe.model.with_doctype(doctype.value);
@@ -320,6 +324,7 @@ export const useStore = defineStore("form-builder-store", () => {
 		selected,
 		get_df,
 		has_standard_field,
+		is_user_generated_field,
 		fetch,
 		reset_changes,
 		validate_fields,