diff --git a/css/tiptap.css b/css/tiptap.css
index a84212a3db..fb9e9d9484 100644
--- a/css/tiptap.css
+++ b/css/tiptap.css
@@ -2,20 +2,20 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-.tiptap-wrapper div[contenteditable=true] {
+.tables-tiptap-wrapper div[contenteditable=true] {
 	width: 100% !important;
 	min-height: 150px;
 }
 
-.tiptap-wrapper .is-active {
+.tables-tiptap-wrapper .is-active {
 	background-color: var(--color-primary) !important;
 }
 
-.tiptap-wrapper {
+.tables-tiptap-wrapper {
 	width: 100%;
 }
 
-.tiptap-wrapper .menuBar button {
+.tables-tiptap-wrapper .menuBar button {
 	position: relative;
 	width: 35px;
 	height: 35px;
@@ -29,10 +29,10 @@
 	vertical-align: top;
 }
 
-.tiptap-wrapper .menuBar button:hover, .tiptap-wrapper .menuBar button:focus, .tiptap-wrapper .menuBar button:active {
+.tables-tiptap-wrapper .menuBar button:hover, .tables-tiptap-wrapper .menuBar button:focus, .tables-tiptap-wrapper .menuBar button:active {
 	background-color: var(--color-background-dark);
 }
 
-.tiptap-wrapper em, .tabulator-cell em {
+.tables-tiptap-wrapper em, .tabulator-cell em {
 	font-style: italic;
 }
diff --git a/src/pages/Context.vue b/src/pages/Context.vue
index 6bc84a53d9..37b091943b 100644
--- a/src/pages/Context.vue
+++ b/src/pages/Context.vue
@@ -235,4 +235,8 @@ export default {
 		padding-left: 0px;
 	}
 }
+:deep(h1) {
+	font-size: unset;
+	font-size: revert;
+}
 </style>
diff --git a/src/pages/Table.vue b/src/pages/Table.vue
index 4c0255cf77..cd1fcee6c7 100644
--- a/src/pages/Table.vue
+++ b/src/pages/Table.vue
@@ -47,6 +47,11 @@ export default {
 	min-width: var(--app-content-width, 100%);
 }
 
+:deep(h1) {
+	font-size: unset;
+	font-size: revert;
+}
+
 @page {
 	size: auto;
 	margin: 5mm;
diff --git a/src/pages/View.vue b/src/pages/View.vue
index 844be25c74..318b43e7f6 100644
--- a/src/pages/View.vue
+++ b/src/pages/View.vue
@@ -41,4 +41,8 @@ export default {
 	width: max-content;
 	min-width: var(--app-content-width, 100%);
 }
+:deep(h1) {
+	font-size: unset;
+	font-size: revert;
+}
 </style>
diff --git a/src/shared/components/ncTable/partials/TableCellHtml.vue b/src/shared/components/ncTable/partials/TableCellHtml.vue
index e4e18361d8..6fa6e39ace 100644
--- a/src/shared/components/ncTable/partials/TableCellHtml.vue
+++ b/src/shared/components/ncTable/partials/TableCellHtml.vue
@@ -3,7 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div class="cell-editor">
+	<div class="cell-editor tables-tiptap-wrapper">
 		<div v-if="!isEditing" @click="handleStartEditing">
 			<EditorContent :editor="editor" />
 		</div>
@@ -118,7 +118,7 @@ export default {
 
 			// Check if the click is outside our editing container
 			if (this.$refs.editingContainer && !this.$refs.editingContainer.contains(event.target)) {
-				const isEditorRelated = event.target.closest('.tiptap-wrapper')
+				const isEditorRelated = event.target.closest('.tables-tiptap-wrapper')
 										|| event.target.closest('.ProseMirror')
 										|| event.target.closest('[contenteditable]')
 										|| event.target.closest('.text-menubar')
@@ -220,7 +220,7 @@ export default {
 	}
 }
 
-:deep(.tiptap-wrapper) {
+:deep(.tables-tiptap-wrapper) {
 	.menuBar {
 		padding: 8px;
 		border-bottom: 1px solid var(--color-border);
diff --git a/src/shared/components/ncTable/partials/TiptapMenuBar.vue b/src/shared/components/ncTable/partials/TiptapMenuBar.vue
index d63da17750..6377105958 100644
--- a/src/shared/components/ncTable/partials/TiptapMenuBar.vue
+++ b/src/shared/components/ncTable/partials/TiptapMenuBar.vue
@@ -3,7 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div class="tiptap-wrapper">
+	<div class="tables-tiptap-wrapper">
 		<div v-if="editor" class="menuBar">
 			<NcButton type="tertiary-no-background" :aria-label="t('tables', 'Undo')" @click="editor.chain().focus().undo().run()">
 				<template #icon>
@@ -201,7 +201,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 
 .character-count {
 	display: flex;
@@ -215,10 +215,7 @@ export default {
 }
 
 /* Basic editor styles */
-.tiptap-wrapper .ProseMirror, .tabulator-cell .ProseMirror {
-	> * + * {
-		/*margin-top: 0.75em;*/
-	}
+.tables-tiptap-wrapper .ProseMirror, .tabulator-cell .ProseMirror {
 
 	ul,
 	ol {
@@ -232,6 +229,8 @@ export default {
 	h5,
 	h6 {
 		line-height: 1.1;
+		font-size: unset;
+		font-size: revert;
 	}
 
 	pre {
@@ -257,7 +256,7 @@ export default {
 	}
 }
 
-.tiptap-wrapper ul[data-type='taskList'], .tabulator-cell ul[data-type='taskList'] {
+.tables-tiptap-wrapper ul[data-type='taskList'], .tabulator-cell ul[data-type='taskList'] {
 	list-style: none;
 	padding: 0;
 	p {
@@ -277,7 +276,14 @@ export default {
 	}
 }
 
-.tiptap-wrapper ul, .tabulator-cell ul {
+.tables-tiptap-wrapper ol, .tabulator-cell ol {
+	li {
+		list-style-type: decimal;
+		margin-left: 15px;
+	}
+}
+
+.tables-tiptap-wrapper ul, .tabulator-cell ul {
 	li {
 		list-style-type: disc;
 		margin-left: 15px;