diff --git a/CHANGELOG.md b/CHANGELOG.md
index 801d20352..968f44621 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@ tech changes will usually be stripped from release notes for the public
 
 ## Unreleased
 
+### Fixed
+
+-   Notes:
+    -   It was possible to open a 'view-only' note on a tab you weren't supposed to see
+
 ## [2024.3.0] - 2024-10-13
 
 ### Removed
diff --git a/client/src/game/ui/notes/NoteEdit.vue b/client/src/game/ui/notes/NoteEdit.vue
index 552298f88..ea8551ac9 100644
--- a/client/src/game/ui/notes/NoteEdit.vue
+++ b/client/src/game/ui/notes/NoteEdit.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onBeforeMount, ref } from "vue";
+import { computed, onBeforeMount, ref, watchEffect } from "vue";
 import VueMarkdown from "vue-markdown-render";
 
 import { useModal } from "../../../core/plugins/modals/plugin";
@@ -30,7 +30,7 @@ const canEdit = computed(() => {
 const localShapenotes = computed(() =>
     note.value === undefined
         ? []
-        : noteState.reactive.shapeNotes.get2(note.value.uuid)?.map((s) => ({ ...getProperties(s), id: s })) ?? [],
+        : (noteState.reactive.shapeNotes.get2(note.value.uuid)?.map((s) => ({ ...getProperties(s), id: s })) ?? []),
 );
 
 const showOnHover = computed({
@@ -100,6 +100,10 @@ const tabs = computed(
 const activeTabIndex = ref(0);
 const activeTab = computed(() => tabs.value[activeTabIndex.value]!.label);
 
+watchEffect(() => {
+    if (!canEdit.value && !tabs.value[activeTabIndex.value]!.visible) activeTabIndex.value = 0;
+});
+
 // Ensure that defaultAccess is always first
 // and that defaultAccess is provided even if it has no DB value
 const accessLevels = computed(() => {