diff --git a/cypress/e2e/viewer.spec.js b/cypress/e2e/viewer.spec.js
index b8d89c3478e..3552400d76a 100644
--- a/cypress/e2e/viewer.spec.js
+++ b/cypress/e2e/viewer.spec.js
@@ -80,6 +80,11 @@ describe('Open test.md in viewer', function() {
 
 		cy.insertLine('- test')
 
+		// Ignore TypeError thrown by cypress keydown + keyup
+		cy.on('uncaught:exception', (err) => {
+			return !err.message.includes('Cannot read properties of undefined (reading \'toLowerCase\')')
+		})
+
 		// Cypress does not have native tab key support, though this seems to work
 		// for triggering the key handler of tiptap
 		// https://github.com/cypress-io/cypress/issues/311
diff --git a/src/EditorFactory.js b/src/EditorFactory.js
index 156eeb674bc..3f53582cf43 100644
--- a/src/EditorFactory.js
+++ b/src/EditorFactory.js
@@ -71,6 +71,7 @@ const createPlainEditor = ({ language, extensions = [] } = {}) => {
 				defaultLanguage: language,
 				exitOnTripleEnter: false,
 			}),
+			FocusTrap,
 			...extensions,
 		],
 	})
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index f526181da38..30b785f98ca 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -10,8 +10,7 @@
 		data-text-el="editor-container"
 		class="text-editor"
 		:class="{ 'is-mobile': isMobile }"
-		tabindex="-1"
-		@keydown.stop="onKeyDown">
+		tabindex="-1">
 		<SkeletonLoading v-if="showLoadingSkeleton" />
 		<CollisionResolveDialog v-if="isResolvingConflict" :sync-error="syncError" />
 		<Wrapper
@@ -390,6 +389,7 @@ export default {
 			window.addEventListener('beforeprint', this.preparePrinting)
 			window.addEventListener('afterprint', this.preparePrinting)
 		}
+		subscribe('text:keyboard:save', this.onKeyboardSave)
 		subscribe('text:image-node:add', this.onAddImageNode)
 		subscribe('text:image-node:delete', this.onDeleteImageNode)
 		this.emit('update:loaded', true)
@@ -413,6 +413,7 @@ export default {
 			window.removeEventListener('beforeprint', this.preparePrinting)
 			window.removeEventListener('afterprint', this.preparePrinting)
 		}
+		unsubscribe('text:keyboard:save', this.onKeyboardSave)
 		unsubscribe('text:image-node:add', this.onAddImageNode)
 		unsubscribe('text:image-node:delete', this.onDeleteImageNode)
 		unsubscribe('text:translate-modal:show', this.showTranslateModal)
@@ -771,6 +772,10 @@ export default {
 			this.emit('blur')
 		},
 
+		onKeyboardSave() {
+			this.$syncService.save()
+		},
+
 		onAddImageNode() {
 			this.emit('add-image-node')
 		},
@@ -893,32 +898,6 @@ export default {
 			this.$editor.setEditable(this.editMode)
 		},
 
-		onKeyDown(event) {
-			if (event.key === 'Escape') {
-				event.preventDefault()
-				return
-			}
-
-			if (
-				event.key === 'Tab'
-				&& !event.shiftKey
-				&& !event.ctrlKey
-				&& !event.metaKey
-				&& this.$editor.isActive('codeBlock')
-			) {
-				this.$editor.commands.insertContent('\t')
-				this.$editor.commands.focus()
-				event.preventDefault()
-				event.stopPropagation()
-				return
-			}
-
-			if ((event.ctrlKey || event.metaKey) && event.key === 's') {
-				this.$syncService.save()
-				event.preventDefault()
-			}
-		},
-
 		showTranslateModal(e) {
 			this.translateContent = e.content
 			this.translateModal = true
diff --git a/src/components/Editor/Wrapper.vue b/src/components/Editor/Wrapper.vue
index 0d98398b4e3..0a5f36a3408 100644
--- a/src/components/Editor/Wrapper.vue
+++ b/src/components/Editor/Wrapper.vue
@@ -15,6 +15,7 @@
 </template>
 
 <script>
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { useIsRichEditorMixin, useIsRichWorkspaceMixin } from './../Editor.provider.js'
 import { OUTLINE_STATE, OUTLINE_ACTIONS, READ_ONLY_ACTIONS } from './Wrapper.provider.js'
 
@@ -91,6 +92,7 @@ export default {
 	},
 
 	mounted() {
+		subscribe('text:keyboard:outline', this.outlineToggle)
 		this.outline.enable = this.isAbleToShowOutline
 
 		this.$watch(
@@ -100,22 +102,17 @@ export default {
 				Object.assign(this.outline, { enable })
 			},
 		)
-
-		document.addEventListener('keydown', this.handleKeyDown)
 	},
+
 	beforeDestroy() {
-		document.removeEventListener('keydown', this.handleKeyDown)
+		unsubscribe('text:keyboard:outline', this.outlineToggle)
 	},
+
 	methods: {
 		outlineToggle() {
 			this.outline.visible = !this.outline.visible
 			this.$emit('outline-toggled', this.outline.visible)
 		},
-		handleKeyDown(event) {
-			if (event.ctrlKey && event.altKey && event.key === 'h') {
-				this.outlineToggle()
-			}
-		},
 		readOnlyToggle() {
 			this.$emit('read-only-toggled')
 		},
diff --git a/src/components/Link/LinkBubbleView.vue b/src/components/Link/LinkBubbleView.vue
index 8ffaaa33b8d..48809522591 100644
--- a/src/components/Link/LinkBubbleView.vue
+++ b/src/components/Link/LinkBubbleView.vue
@@ -71,7 +71,7 @@
 				name="newHref"
 				:label="t('text', 'URL')"
 				:value.sync="newHref"
-				@keypress.enter.prevent="updateLink" />
+				@keyup.enter.prevent="updateLink" />
 		</div>
 
 		<!-- link preview -->
diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index bd4a8df6814..e1a723c1da9 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -22,8 +22,8 @@
 			role="toolbar"
 			class="text-menubar__entries"
 			:aria-label="t('text', 'Formatting menu bar')"
-			@keydown.left.stop="handleToolbarNavigation"
-			@keydown.right.stop="handleToolbarNavigation">
+			@keyup.left.stop="handleToolbarNavigation"
+			@keyup.right.stop="handleToolbarNavigation">
 			<!-- The visible inline actions -->
 			<component :is="actionEntry.component ? actionEntry.component : (actionEntry.children ? 'ActionList' : 'ActionSingle')"
 				v-for="(actionEntry, index) in visibleEntries"
diff --git a/src/components/Menu/ToolBarLogic.js b/src/components/Menu/ToolBarLogic.js
index 8d91c2e7cbc..e6e0665ee61 100644
--- a/src/components/Menu/ToolBarLogic.js
+++ b/src/components/Menu/ToolBarLogic.js
@@ -66,7 +66,7 @@ export default defineComponent({
 
 		/**
 		 * Handle navigation in toolbar
-		 * @param {KeyboardEvent} event The keydown event
+		 * @param {KeyboardEvent} event The keyup event
 		 */
 		handleToolbarNavigation(event) {
 			if (event.key === 'ArrowRight') {
diff --git a/src/components/PlainTextReader.vue b/src/components/PlainTextReader.vue
index 3ac5920be19..0c316301cc7 100644
--- a/src/components/PlainTextReader.vue
+++ b/src/components/PlainTextReader.vue
@@ -8,8 +8,6 @@
 </template>
 
 <script>
-/* eslint-disable import/no-named-as-default */
-import CodeBlock from '@tiptap/extension-code-block'
 import escapeHtml from 'escape-html'
 import BaseReader from './BaseReader.vue'
 import { PlainText } from './../extensions/index.js'
@@ -22,7 +20,7 @@ export default {
 		renderHtml(content) {
 			return '<pre>' + escapeHtml(content) + '</pre>'
 		},
-		extensions: () => [PlainText, CodeBlock],
+		extensions: () => [PlainText],
 	},
 
 	props: {
diff --git a/src/extensions/FocusTrap.js b/src/extensions/FocusTrap.js
index e5f32056bc2..5250d4e9f74 100644
--- a/src/extensions/FocusTrap.js
+++ b/src/extensions/FocusTrap.js
@@ -7,14 +7,29 @@ import { Extension } from '@tiptap/core'
 
 let ownPaused = false
 
+const checkHasExtension = (editor, extensionName) => {
+	return editor.extensionManager.extensions.some(
+		(extension) => extension.name === extensionName,
+	)
+}
+
+const checkHasListExtension = (editor) => {
+	return (
+		checkHasExtension(editor, 'bulletList')
+		|| checkHasExtension(editor, 'orderedList')
+		|| checkHasExtension(editor, 'taskList')
+	)
+}
+
 const toggleFocusTrap = ({ editor }) => {
 	const trapStack = window._nc_focus_trap ?? []
 	const activeTrap = trapStack[trapStack.length - 1]
 
 	const possibleEditorTabCommand =
-		editor.can().sinkListItem('listItem')
-		|| editor.can().goToNextCell()
-		|| editor.can().goToPreviousCell()
+		(checkHasListExtension(editor) && editor.can().sinkListItem('listItem'))
+		|| (checkHasExtension(editor, 'table') && editor.can().goToNextCell())
+		|| (checkHasExtension(editor, 'table') && editor.can().goToPreviousCell())
+		|| (checkHasExtension(editor, 'codeBlock') && editor.isActive('codeBlock'))
 
 	if (possibleEditorTabCommand) {
 		activeTrap?.pause()
diff --git a/src/extensions/Keymap.js b/src/extensions/Keymap.js
index aac4ea90641..d1e834d1734 100644
--- a/src/extensions/Keymap.js
+++ b/src/extensions/Keymap.js
@@ -5,12 +5,22 @@
 
 import { Extension } from '@tiptap/core'
 import { Plugin } from '@tiptap/pm/state'
+import { emit } from '@nextcloud/event-bus'
 
 const Keymap = Extension.create({
-	name: 'customkeymap',
+	name: 'CustomKeymap',
 
 	addKeyboardShortcuts() {
-		return this.options
+		return {
+			/**
+			 * <Mod>-<Alt>-<H>
+			 * Toggle editor outline
+			 */
+			'Mod-Alt-h': () => {
+				emit('text:keyboard:outline')
+				return true
+			},
+		}
 	},
 
 	addProseMirrorPlugins() {
@@ -18,22 +28,49 @@ const Keymap = Extension.create({
 			new Plugin({
 				props: {
 					handleKeyDown(view, event) {
-						const key = event.key || event.keyCode
+						/**
+						 * <Mod>-<S>
+						 * Save editor content
+						 */
 						if (
 							(event.ctrlKey || event.metaKey)
+							&& !event.altKey
 							&& !event.shiftKey
-							&& (key === 'f' || key === 70)
+							&& event.key === 's'
 						) {
-							// We need to stop propagation and dispatch the event on the window
-							// in order to force triggering the browser native search in the text editor
+							event.preventDefault()
 							event.stopPropagation()
-							window.dispatchEvent(event)
+							emit('text:keyboard:save')
 							return true
 						}
-						if (event.key === 'Delete' && event.ctrlKey === true) {
-							// Prevent deleting the file, by core Viewer.vue
+
+						/**
+						 * <Esc>
+						 * Overwrite Viewer keybinding to close viewer
+						 */
+						if (
+							!event.ctrlKey
+							&& !event.metaKey
+							&& !event.altKey
+							&& !event.shiftKey
+							&& event.key === 'Escape'
+						) {
+							event.preventDefault()
+							event.stopPropagation()
+							return true
+						}
+
+						/**
+						 * <Mod>-<Del>
+						 * Overwrite Viewer keybinding to delete the file
+						 */
+						if (
+							(event.ctrlKey || event.metaKey)
+							&& !event.altKey
+							&& !event.shiftKey
+							&& event.key === 'Delete'
+						) {
 							event.stopPropagation()
-							window.dispatchEvent(event)
 							return true
 						}
 					},
diff --git a/src/extensions/PlainText.js b/src/extensions/PlainText.js
index 24daf18cb45..bc8ab3eacee 100644
--- a/src/extensions/PlainText.js
+++ b/src/extensions/PlainText.js
@@ -5,14 +5,16 @@
 
 import { Extension } from '@tiptap/core'
 
+import CodeBlockPlainText from './../nodes/CodeBlockPlainText.js'
+import Keymap from './Keymap.js'
+import PlainTextDocument from './../nodes/PlainTextDocument.js'
 /* eslint-disable import/no-named-as-default */
 import Text from '@tiptap/extension-text'
-import PlainTextDocument from './../nodes/PlainTextDocument.js'
 
 export default Extension.create({
 	name: 'PlainText',
 
 	addExtensions() {
-		return [PlainTextDocument, Text]
+		return [CodeBlockPlainText, Keymap, PlainTextDocument, Text]
 	},
 })
diff --git a/src/extensions/RichText.js b/src/extensions/RichText.js
index af81b452e79..65d98391432 100644
--- a/src/extensions/RichText.js
+++ b/src/extensions/RichText.js
@@ -27,21 +27,22 @@ import HorizontalRule from '@tiptap/extension-horizontal-rule'
 import Image from './../nodes/Image.js'
 import ImageInline from './../nodes/ImageInline.js'
 import KeepSyntax from './KeepSyntax.js'
-import LinkPicker from './../extensions/LinkPicker.js'
+import Keymap from './Keymap.js'
 import LinkBubble from './../extensions/LinkBubble.js'
+import LinkPicker from './../extensions/LinkPicker.js'
 import ListItem from '@tiptap/extension-list-item'
 import Markdown from './../extensions/Markdown.js'
 import Mention from './../extensions/Mention.js'
-import Search from './../extensions/Search.js'
 import OrderedList from './../nodes/OrderedList.js'
 import Paragraph from './../nodes/Paragraph.js'
 import Preview from './../nodes/Preview.js'
+import Search from './../extensions/Search.js'
 import Table from './../nodes/Table.js'
 import TaskItem from './../nodes/TaskItem.js'
 import TaskList from './../nodes/TaskList.js'
 import Text from '@tiptap/extension-text'
-import TrailingNode from './../nodes/TrailingNode.js'
 import TextDirection from 'tiptap-text-direction'
+import TrailingNode from './../nodes/TrailingNode.js'
 /* eslint-enable import/no-named-as-default */
 
 import { Strong, Italic, Strike, Link, Underline } from './../marks/index.js'
@@ -98,6 +99,7 @@ export default Extension.create({
 			Dropcursor,
 			Gapcursor,
 			KeepSyntax,
+			Keymap,
 			FrontMatter,
 			Mention,
 			Search,
diff --git a/src/extensions/index.js b/src/extensions/index.js
index 40022775c10..86b6b811a04 100644
--- a/src/extensions/index.js
+++ b/src/extensions/index.js
@@ -6,7 +6,6 @@
 import CollaborationCursor from './CollaborationCursor.js'
 import Emoji from './Emoji.js'
 import FocusTrap from './FocusTrap.js'
-import Keymap from './Keymap.js'
 import UserColor from './UserColor.js'
 import Markdown from './Markdown.js'
 import PlainText from './PlainText.js'
@@ -18,7 +17,6 @@ export {
 	CollaborationCursor,
 	Emoji,
 	FocusTrap,
-	Keymap,
 	UserColor,
 	Markdown,
 	PlainText,
diff --git a/src/nodes/CodeBlock.js b/src/nodes/CodeBlock.js
index 4e3ae12a771..c2405ceb4ea 100644
--- a/src/nodes/CodeBlock.js
+++ b/src/nodes/CodeBlock.js
@@ -5,7 +5,8 @@
 
 import TiptapCodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
 import { VueNodeViewRenderer } from '@tiptap/vue-2'
-import CodeBlockView from './CodeBlockView.vue'
+import codeBlockShortcuts from './CodeBlock/codeBlockShortcuts.js'
+import CodeBlockView from './CodeBlock/CodeBlockView.vue'
 
 const CodeBlock = TiptapCodeBlockLowlight.extend({
 	parseHTML() {
@@ -49,21 +50,7 @@ const CodeBlock = TiptapCodeBlockLowlight.extend({
 	},
 
 	addKeyboardShortcuts() {
-		return {
-			'Mod-a': () => {
-				if (!this.editor.isActive('codeBlock')) {
-					return
-				}
-
-				const nodeSize = this.editor.state.selection.$from.node().nodeSize
-				this.editor.commands.selectParentNode()
-				const from = this.editor.state.selection.$from.pos
-				const to = from + nodeSize
-				this.editor.commands.setTextSelection({ from, to })
-
-				return true
-			},
-		}
+		return codeBlockShortcuts
 	},
 })
 
diff --git a/src/nodes/CodeBlockView.vue b/src/nodes/CodeBlock/CodeBlockView.vue
similarity index 98%
rename from src/nodes/CodeBlockView.vue
rename to src/nodes/CodeBlock/CodeBlockView.vue
index 6ff7e3b4243..0c0da52c346 100644
--- a/src/nodes/CodeBlockView.vue
+++ b/src/nodes/CodeBlock/CodeBlockView.vue
@@ -117,7 +117,7 @@ import Help from 'vue-material-design-icons/Help.vue'
 import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
 import Check from 'vue-material-design-icons/Check.vue'
 
-import CopyToClipboardMixin from '../mixins/CopyToClipboardMixin.js'
+import CopyToClipboardMixin from '../../mixins/CopyToClipboardMixin.js'
 
 export default {
 	name: 'CodeBlockView',
diff --git a/src/nodes/CodeBlock/codeBlockShortcuts.js b/src/nodes/CodeBlock/codeBlockShortcuts.js
new file mode 100644
index 00000000000..d219a4ac26f
--- /dev/null
+++ b/src/nodes/CodeBlock/codeBlockShortcuts.js
@@ -0,0 +1,47 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+const codeBlockShortcuts = {
+	/**
+	 * <Tab> in CodeBlock
+	 * Insert tab char instead of navigating the focus via Tab
+	 *
+	 * @param {object} object - object
+	 * @param {object} object.editor - the editor
+	 */
+	'Tab': ({ editor }) => {
+		if (!editor.isActive('codeBlock')) {
+			return
+		}
+
+		editor.commands.insertContent('\t')
+		editor.commands.focus()
+
+		return true
+	},
+
+	/**
+	 * <Mod>-<A> in CodeBlock
+	 * Select all content of current code block
+	 *
+	 * @param {object} object - object
+	 * @param {object} object.editor - the editor
+	 */
+	'Mod-a': ({ editor }) => {
+		if (!editor.isActive('codeBlock')) {
+			return
+		}
+
+		const nodeSize = editor.state.selection.$from.node().nodeSize
+		editor.commands.selectParentNode()
+		const from = editor.state.selection.$from.pos
+		const to = from + nodeSize
+		editor.commands.setTextSelection({ from, to })
+
+		return true
+	},
+}
+
+export default codeBlockShortcuts
diff --git a/src/nodes/CodeBlockPlainText.js b/src/nodes/CodeBlockPlainText.js
new file mode 100644
index 00000000000..46732db0fbd
--- /dev/null
+++ b/src/nodes/CodeBlockPlainText.js
@@ -0,0 +1,15 @@
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import TiptapCodeBlock from '@tiptap/extension-code-block'
+import codeBlockShortcuts from './CodeBlock/codeBlockShortcuts.js'
+
+const CodeBlockPlainText = TiptapCodeBlock.extend({
+	addKeyboardShortcuts() {
+		return codeBlockShortcuts
+	},
+})
+
+export default CodeBlockPlainText
diff --git a/src/nodes/Details.js b/src/nodes/Details.js
index 1a70c329785..b7c0b31323a 100644
--- a/src/nodes/Details.js
+++ b/src/nodes/Details.js
@@ -184,7 +184,13 @@ const Details = Node.create({
 
 	addKeyboardShortcuts() {
 		return {
-			// If in detailsSummary: Make sure details is open and jump to content
+			/**
+			 * <Enter> in summary
+			 * Expand details and jump to content
+			 *
+			 * @param {object} object - object
+			 * @param {object} object.editor - the editor
+			 */
 			Enter: ({ editor }) => {
 				const { state } = editor
 				const { schema, selection } = state
@@ -216,7 +222,14 @@ const Details = Node.create({
 
 				return editor.commands.setTextSelection($from.after())
 			},
-			// Unset details with backspace in empty summary
+
+			/**
+			 * <Backspace> in empty summary
+			 * Unset details
+			 *
+			 * @param {object} object - object
+			 * @param {object} object.editor - the editor
+			 */
 			Backspace: ({ editor }) => {
 				const { state } = editor
 				const { schema, selection } = state
diff --git a/src/nodes/Paragraph.js b/src/nodes/Paragraph.js
index b510841c65c..62d42152e65 100644
--- a/src/nodes/Paragraph.js
+++ b/src/nodes/Paragraph.js
@@ -16,6 +16,10 @@ const Paragraph = TiptapParagraph.extend({
 
 	addKeyboardShortcuts() {
 		return {
+			/**
+			 * <Backspace> at beginning of new paragraph
+			 * Convert leading paragraph break into hard break
+			 */
 			Backspace: () => {
 				// Check that cursor is at beginning of text
 				const selection = this.editor.state.selection
diff --git a/src/nodes/PlainTextDocument.js b/src/nodes/PlainTextDocument.js
index b85a404ed55..ec3454470d2 100644
--- a/src/nodes/PlainTextDocument.js
+++ b/src/nodes/PlainTextDocument.js
@@ -8,9 +8,4 @@ import { Node } from '@tiptap/core'
 export default Node.create({
 	name: 'doc',
 	content: 'block',
-	addKeyboardShortcuts() {
-		return {
-			Tab: () => this.editor.commands.insertContent('\t'),
-		}
-	},
 })
diff --git a/src/nodes/Table/Table.js b/src/nodes/Table/Table.js
index 6e14e0bfeb1..9838748041f 100644
--- a/src/nodes/Table/Table.js
+++ b/src/nodes/Table/Table.js
@@ -238,7 +238,19 @@ export default Table.extend({
 	addKeyboardShortcuts() {
 		return {
 			...this.parent(),
+			/**
+			 * <Tab> inside a table cell
+			 * Jump to next cell or outside table if already in last cell
+			 */
 			Tab: () => this.editor.commands.goToNextCell() || this.editor.commands.leaveTable(),
+
+			/**
+			 * <Enter> inside a table
+			 * Insert newline or jump to next row if already in new line
+			 *
+			 * @param {object} object - object
+			 * @param {object} object.editor - the editor
+			 */
 			Enter: ({ editor }) => {
 				const { selection } = editor.state
 				if (!selection.$from.parent.type.name.startsWith('table')) return false