diff --git a/ui/src/components/inputs/EditorView.vue b/ui/src/components/inputs/EditorView.vue
index 97cca853bd..6e1c0b0f0f 100644
--- a/ui/src/components/inputs/EditorView.vue
+++ b/ui/src/components/inputs/EditorView.vue
@@ -587,10 +587,8 @@
         timer.value = setTimeout(() => onEdit(event, isFlow), 500);
     };
 
-    const switchViewType = (event, shouldPersist = true) => {
-        if(shouldPersist) persistViewType(event)
-        else viewType.value = event
-
+    const switchViewType = (event) => {
+        persistViewType(event);
         if (
             [editorViewTypes.TOPOLOGY, editorViewTypes.SOURCE_TOPOLOGY].includes(
                 viewType.value
@@ -881,13 +879,7 @@
         return tab.name === currentTab.value.name;
     }
 
-    watch(currentTab, (current, previous) => {
-        const isCurrentFlow = current?.name === "Flow";
-        const isPreviousFlow = previous?.name === "Flow";
-
-        if(isPreviousFlow) persistViewType(viewType.value);
-        switchViewType(isCurrentFlow ? loadViewType() : editorViewTypes.SOURCE, false)
-        
+    watch(currentTab, () => {
         nextTick(() => {
             const activeTabElement = tabsScrollRef.value.wrapRef.querySelector(".tab-active");
             const rightMostCurrentTabPixel = activeTabElement.offsetLeft + activeTabElement.clientWidth;
diff --git a/ui/src/components/inputs/SwitchView.vue b/ui/src/components/inputs/SwitchView.vue
index 3e4f528eb5..f27697709f 100644
--- a/ui/src/components/inputs/SwitchView.vue
+++ b/ui/src/components/inputs/SwitchView.vue
@@ -3,17 +3,17 @@
         <el-tooltip :content="$t('source')" transition="" :hide-after="0" :persistent="false" effect="light">
             <el-button :type="buttonType(editorViewTypes.SOURCE)" @click="switchView(editorViewTypes.SOURCE)" :icon="FileDocumentEditOutline" />
         </el-tooltip>
-        <el-tooltip :content="!isFlow ? $t('flow_only') : $t('source and doc')" transition="" :hide-after="0" :persistent="false" effect="light">
-            <el-button :disabled="!isFlow" :type="buttonType(editorViewTypes.SOURCE_DOC)" @click="switchView(editorViewTypes.SOURCE_DOC)" :icon="BookOpenOutline" />
+        <el-tooltip :content="$t('source and doc')" transition="" :hide-after="0" :persistent="false" effect="light">
+            <el-button :type="buttonType(editorViewTypes.SOURCE_DOC)" @click="switchView(editorViewTypes.SOURCE_DOC)" :icon="BookOpenOutline" />
         </el-tooltip>
-        <el-tooltip :content="!isFlow ? $t('flow_only') : $t('source and topology')" transition="" :hide-after="0" :persistent="false" effect="light">
-            <el-button :disabled="!isFlow" :type="buttonType(editorViewTypes.SOURCE_TOPOLOGY)" @click="switchView(editorViewTypes.SOURCE_TOPOLOGY)" :icon="FileTableOutline" />
+        <el-tooltip :content="$t('source and topology')" transition="" :hide-after="0" :persistent="false" effect="light">
+            <el-button :type="buttonType(editorViewTypes.SOURCE_TOPOLOGY)" @click="switchView(editorViewTypes.SOURCE_TOPOLOGY)" :icon="FileTableOutline" />
         </el-tooltip>
-        <el-tooltip :content="!isFlow ? $t('flow_only') : $t('topology')" transition="" :hide-after="0" :persistent="false" effect="light">
-            <el-button :disabled="!isFlow" :type="buttonType(editorViewTypes.TOPOLOGY)" @click="switchView(editorViewTypes.TOPOLOGY)" :icon="FileTreeOutline" />
+        <el-tooltip :content="$t('topology')" transition="" :hide-after="0" :persistent="false" effect="light">
+            <el-button :type="buttonType(editorViewTypes.TOPOLOGY)" @click="switchView(editorViewTypes.TOPOLOGY)" :icon="FileTreeOutline" />
         </el-tooltip>
-        <el-tooltip :content="!isFlow ? $t('flow_only') : $t('source and blueprints')" transition="" :hide-after="0" :persistent="false" effect="light">
-            <el-button :disabled="!isFlow" :type="buttonType(editorViewTypes.SOURCE_BLUEPRINTS)" @click="switchView(editorViewTypes.SOURCE_BLUEPRINTS)" :icon="BallotOutline" />
+        <el-tooltip :content="$t('source and blueprints')" transition="" :hide-after="0" :persistent="false" effect="light">
+            <el-button :type="buttonType(editorViewTypes.SOURCE_BLUEPRINTS)" @click="switchView(editorViewTypes.SOURCE_BLUEPRINTS)" :icon="BallotOutline" />
         </el-tooltip>
     </el-button-group>
 </template>
@@ -28,7 +28,7 @@
 </script>
 
 <script>
-    import {mapState, mapMutations} from "vuex";
+    import {mapMutations} from "vuex";
 
     export default {
         props: {
@@ -38,14 +38,6 @@
             }
         },
         emits: ["switch-view"],
-        computed: {
-            ...mapState({
-                currentTab: (state) => state.editor.current
-            }),
-            isFlow(){
-                return this.currentTab?.name === "Flow"
-            }
-        },
         methods: {
             ...mapMutations("editor", ["changeView"]),
 
diff --git a/ui/src/translations/en.json b/ui/src/translations/en.json
index 562f5ad3cc..046be3975c 100644
--- a/ui/src/translations/en.json
+++ b/ui/src/translations/en.json
@@ -803,7 +803,6 @@
     "ee-tooltip": {
       "features-blocked": "This feature requires Enterprise Edition.",
       "button": "Talk to us"
-    },
-    "flow_only": "Only available on Flow tab."
+    }
   }
 }
\ No newline at end of file
diff --git a/ui/src/translations/fr.json b/ui/src/translations/fr.json
index a06b2d1a44..ad5531b301 100644
--- a/ui/src/translations/fr.json
+++ b/ui/src/translations/fr.json
@@ -775,7 +775,6 @@
     "ee-tooltip": {
       "features-blocked": "Cette fonctionnalité nécessite l'édition Enterprise.",
       "button": "Contactez-nous"
-    },
-    "flow_only": "Disponible uniquement sur l'onglet Flow."
+    }
   }
 }
\ No newline at end of file