diff --git a/frontend/src2/query/Query.vue b/frontend/src2/query/Query.vue
index 9bcb4d46..a878b4a3 100644
--- a/frontend/src2/query/Query.vue
+++ b/frontend/src2/query/Query.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { provide } from 'vue'
+import { computed, provide } from 'vue'
 import { WorkbookQuery } from '../types/workbook.types'
 import NativeQueryEditor from './components/NativeQueryEditor.vue'
 import QueryBuilder from './components/QueryBuilder.vue'
@@ -10,9 +10,13 @@ const query = useQuery(props.query)
 provide('query', query)
 window.query = query
 query.execute()
+
+const is_builder_query = computed(
+	() => query.doc.is_builder_query || query.doc.operations.find((op) => op.type === 'source')
+)
 </script>
 
 <template>
-	<QueryBuilder v-if="query.doc.is_builder_query" />
+	<QueryBuilder v-if="is_builder_query" />
 	<NativeQueryEditor v-else-if="query.doc.is_native_query" />
 </template>
diff --git a/frontend/src2/workbook/WorkbookQuery.vue b/frontend/src2/workbook/WorkbookQuery.vue
index 20c169cd..d9b4f30e 100644
--- a/frontend/src2/workbook/WorkbookQuery.vue
+++ b/frontend/src2/workbook/WorkbookQuery.vue
@@ -9,12 +9,14 @@ const props = defineProps<{ name?: string; index: number | string }>()
 const workbook = inject<Workbook>(workbookKey)
 const activeQuery = computed(() => workbook?.doc.queries[Number(props.index)])
 
-const typeIsSet = computed(
-	() =>
+const typeIsSet = computed(() => {
+	return (
 		activeQuery.value?.is_native_query ||
 		activeQuery.value?.is_script_query ||
-		activeQuery.value?.is_builder_query
-)
+		activeQuery.value?.is_builder_query ||
+		activeQuery.value?.operations.find((op) => op.type === 'source')
+	)
+})
 
 function setQueryType(interfaceType: 'query-builder' | 'sql-editor' | 'script-editor') {
 	if (!activeQuery.value) return