diff --git a/ui/src/components/inputs/EditorView.vue b/ui/src/components/inputs/EditorView.vue
index dde905779a9..ee1cd17fe05 100644
--- a/ui/src/components/inputs/EditorView.vue
+++ b/ui/src/components/inputs/EditorView.vue
@@ -71,6 +71,7 @@
             <el-switch
                 v-if="!isNamespace"
                 v-model="editorViewType"
+                @change="changeEditorViewType"
                 active-value="NO_CODE"
                 inactive-value="YAML"
                 :inactive-text="$t('no_code.labels.no_code')"
@@ -494,6 +495,9 @@
     });
 
     const editorViewType = ref("YAML");
+    const changeEditorViewType = (value) => {
+        localStorage.setItem(storageKeys.EDITOR_VIEW_TYPE, value);
+    }
 
     const handleTopologyEditClick = (params) => {
         editorViewType.value = "NO_CODE";
diff --git a/ui/src/components/inputs/SwitchView.vue b/ui/src/components/inputs/SwitchView.vue
index 973428e9289..85733a9daa1 100644
--- a/ui/src/components/inputs/SwitchView.vue
+++ b/ui/src/components/inputs/SwitchView.vue
@@ -9,9 +9,6 @@
         <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>
-        <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>
         <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>
@@ -22,7 +19,6 @@
     import FileDocumentEditOutline from "vue-material-design-icons/FileDocumentEditOutline.vue";
     import BookOpenOutline from "vue-material-design-icons/BookOpenOutline.vue";
     import FileTableOutline from "vue-material-design-icons/FileTableOutline.vue";
-    import FileTreeOutline from "vue-material-design-icons/FileTreeOutline.vue";
     import BallotOutline from "vue-material-design-icons/BallotOutline.vue";
     import {editorViewTypes} from "../../utils/constants";
 </script>