diff --git a/api/src/reportcreator_api/api_utils/serializers.py b/api/src/reportcreator_api/api_utils/serializers.py
index a01a7d23e..87af82e81 100644
--- a/api/src/reportcreator_api/api_utils/serializers.py
+++ b/api/src/reportcreator_api/api_utils/serializers.py
@@ -128,49 +128,3 @@ def validate_aes_key(self, value):
         except ValueError:
             raise serializers.ValidationError('Invalid base64 encoding')
 
-
-# TODO: spellcheck adaptions
-# * [x] update languagetool
-# * [x] picky mode + advanced config
-# * [x] spellcheck API: use picky mode + config
-# * [ ] frontend
-#   * [ ] in community: reset spellcheckEnabled to false on navigation
-#   * [x] rework spellcheck enabled
-#      * [x] localSettings.spellcheckEnabled
-#      * [x] MarkdownFieldContent
-#      * [x] MarkdownTextFieldContent
-#      * [x] MarkdownPage
-#      * [x] MarkdownToolbar
-#   * [x] pass spellcheckEnabled as props + event update:spellcheckEnabled
-#      * [x] section
-#      * [x] finding
-#      * [x] project note
-#      * [x] personal notes
-#      * [x] template
-#      * [x] preview data
-#      * [x] layout editor
-#      * [x] report fields
-#      * [x] finding fields
-#   * [x] rework markdownEditorMode
-#      * [x] localSettings.markdownEditorMode
-#      * [x] MarkdownFieldContent
-#      * [x] MarkdownPage
-#      * [x] MarkdownToolbar
-#   * [x] pass markdownEditorMode as props + event update:markdownEditorMode
-#      * [x] section
-#      * [x] finding
-#      * [x] project note
-#      * [x] personal notes
-#      * [x] template
-#      * [x] preview data
-#      * [x] layout editor
-#      * [x] report fields
-#      * [x] finding fields
-#      * [x] template history
-#      * [x] section history 
-#      * [x] finding history
-#      * [x] project note history
-
-# * [x] docs: new languagetool env variables
-# * [x] markdown images: add "{width=100%}""
-        
\ No newline at end of file
diff --git a/frontend/src/app.vue b/frontend/src/app.vue
index c83eb67ae..c6d80e419 100644
--- a/frontend/src/app.vue
+++ b/frontend/src/app.vue
@@ -8,14 +8,14 @@
 
 <script setup lang="ts">
 const route = useRoute();
-useHeadExtended({
-  titleTemplate: title => rootTitleTemplate(title, route),
-});
-
 const auth = useAuth();
 const localSettings = useLocalSettings();
 const apiSettings = useApiSettings();
 
+useHeadExtended({
+  titleTemplate: title => rootTitleTemplate(title, route),
+});
+
 const colorSchemeQueryList = window.matchMedia('(prefers-color-scheme: dark)');
 const systemThemeIsDark = ref<boolean>(colorSchemeQueryList.matches);
 colorSchemeQueryList.addEventListener('change', (event) => {
@@ -40,4 +40,12 @@ const theme = computed(() => {
     return baseTheme;
   }
 });
+
+const router = useRouter();
+watch(router.currentRoute, () => {
+  // Reset browser-based spellcheck on navigation
+  if (!apiSettings.settings?.features.spellcheck) {
+    localSettings.setAllSpellcheckSettings(false);
+  }
+})
 </script>
diff --git a/frontend/src/components/Markdown/Toolbar.vue b/frontend/src/components/Markdown/Toolbar.vue
index 327477b86..5f6fef4ab 100644
--- a/frontend/src/components/Markdown/Toolbar.vue
+++ b/frontend/src/components/Markdown/Toolbar.vue
@@ -18,7 +18,7 @@
     <markdown-toolbar-button
       v-if="apiSettings.isProfessionalLicense"
       @click="toggleSpellcheck"
-      title="Spellcheck"
+      title="Spell check"
       icon="mdi-spellcheck"
       :disabled="props.disabled || !spellcheckSupported"
       :active="spellcheckEnabled"
@@ -26,7 +26,7 @@
     <markdown-toolbar-button
       v-else
       @click="toggleSpellcheck"
-      :title="'Spellcheck'"
+      :title="'Spell check (basic)'"
       icon="mdi-spellcheck"
       :dot="!spellcheckSupported ? undefined : (spellcheckEnabled ? 'warning' : 'error')"
       :disabled="props.disabled || !spellcheckSupported"
@@ -95,7 +95,7 @@ function toggleSpellcheck() {
   const newVal = !props.spellcheckEnabled;
   emit('update:spellcheckEnabled', newVal);
   if (newVal && !apiSettings.isProfessionalLicense) {
-    warningToast('Basic spellcheck enabled. Upgrade to Professional for advanced options.');
+    warningToast('Basic spell check enabled. Upgrade to SysReptor Professional for advanced options.');
   }
 }
 
diff --git a/frontend/src/components/Markdown/ToolbarButton.vue b/frontend/src/components/Markdown/ToolbarButton.vue
index 13a8efcb4..7bf37be7a 100644
--- a/frontend/src/components/Markdown/ToolbarButton.vue
+++ b/frontend/src/components/Markdown/ToolbarButton.vue
@@ -11,7 +11,7 @@
     </v-badge>
     <v-icon v-else size="small" :icon="props.icon" />
 
-    <s-tooltip v-if="props.title" :text="props.title" />
+    <s-tooltip v-if="props.title" activator="parent" location="top" :text="props.title" />
   </s-btn-icon>
 </template>