diff --git a/src/components/Editor/SmartPickerMenu.vue b/src/components/Editor/SmartPickerMenu.vue
index cbc10986587..7266530d166 100644
--- a/src/components/Editor/SmartPickerMenu.vue
+++ b/src/components/Editor/SmartPickerMenu.vue
@@ -5,26 +5,23 @@
 
 <template>
 	<div contenteditable="false" class="smart-picker-menu-container">
-		<NcActions :title="t('text', 'Open the Smart Picker')" :type="'tertiary'">
-			<NcActionButton @click="$emit('open-smart-picker')">
-				<template #icon>
-					<PlusIcon />
-				</template>
-			</NcActionButton>
-		</NcActions>
+		<NcButton :aria-label="t('text', 'Open the Smart Picker')" :type="'tertiary'" @click="$emit('open-smart-picker')">
+			<template #icon>
+				<PlusIcon />
+			</template>
+		</NcButton>
 	</div>
 </template>
 
 <script>
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
-import { NcActions, NcActionButton } from '@nextcloud/vue'
+import { NcButton } from '@nextcloud/vue'
 
 export default {
 	name: 'SmartPickerMenu',
 	components: {
 		PlusIcon,
-		NcActions,
-		NcActionButton,
+		NcButton,
 	},
 }
 
diff --git a/src/plugins/currentLineMenu.js b/src/plugins/currentLineMenu.js
index 484567a22a3..ab0fa8ddc40 100644
--- a/src/plugins/currentLineMenu.js
+++ b/src/plugins/currentLineMenu.js
@@ -131,7 +131,7 @@ function currentParagraphDecorations(doc, currentParagraph, editor) {
  */
 function decorationForCurrentParagraph(currentParagraph, editor) {
 	return Decoration.widget(
-		currentParagraph.pos + 1,
+		currentParagraph?.pos + 1,
 		menuForCurrentParagraph(editor),
 		{ side: -1 },
 	)
diff --git a/src/tests/plugins/extractLinkParagraphs.spec.js b/src/tests/plugins/extractLinkParagraphs.spec.js
index a29183ca831..a4fcd2419b0 100644
--- a/src/tests/plugins/extractLinkParagraphs.spec.js
+++ b/src/tests/plugins/extractLinkParagraphs.spec.js
@@ -23,7 +23,7 @@ describe('extractLinkParagraphs', () => {
 		const doc = prepareDoc(content)
 		const paragraphs = extractLinkParagraphs(doc)
 		expect(paragraphs).toEqual([
-			{ offset: 0, type: 'text-only', nodeSize: 6 },
+			{ pos: 0, type: 'text-only', nodeSize: 6 },
 		])
 	})
 
@@ -31,7 +31,7 @@ describe('extractLinkParagraphs', () => {
 		const doc = prepareDoc(preview)
 		const paragraphs = extractLinkParagraphs(doc)
 		expect(paragraphs).toEqual([
-			{ offset: 0, type: 'link-preview', nodeSize: 6 },
+			{ pos: 0, type: 'link-preview', nodeSize: 6 },
 		])
 	})
 
@@ -40,7 +40,7 @@ describe('extractLinkParagraphs', () => {
 		const doc = prepareDoc(content)
 		const paragraphs = extractLinkParagraphs(doc)
 		expect(paragraphs).toEqual([
-			{ offset: 0, type: 'text-only', nodeSize: 7 },
+			{ pos: 0, type: 'text-only', nodeSize: 7 },
 		])
 	})
 
@@ -50,8 +50,8 @@ describe('extractLinkParagraphs', () => {
 		const doc = prepareDoc(content)
 		const paragraphs = extractLinkParagraphs(doc)
 		expect(paragraphs).toEqual([
-			{ offset: 0, type: 'text-only', nodeSize: 6 },
-			{ offset: 6, type: 'text-only', nodeSize: 6 },
+			{ pos: 0, type: 'text-only', nodeSize: 6 },
+			{ pos: 6, type: 'text-only', nodeSize: 6 },
 		])
 	})
 
@@ -60,8 +60,8 @@ describe('extractLinkParagraphs', () => {
 		const doc = prepareDoc(content)
 		const paragraphs = extractLinkParagraphs(doc)
 		expect(paragraphs).toEqual([
-			{ offset: 0, type: 'text-only', nodeSize: 6 },
-			{ offset: 6, type: 'link-preview', nodeSize: 6 },
+			{ pos: 0, type: 'text-only', nodeSize: 6 },
+			{ pos: 6, type: 'link-preview', nodeSize: 6 },
 		])
 	})