diff --git a/src/components/Editor/ContentContainer.vue b/src/components/Editor/ContentContainer.vue
index f7740c4fd1c..7d820304581 100644
--- a/src/components/Editor/ContentContainer.vue
+++ b/src/components/Editor/ContentContainer.vue
@@ -14,13 +14,7 @@
 			<EditorOutline />
 		</div>
 		<slot />
-		<DragHandle :editor="editor" class="drag-handle--button">
-			<NcButton type="tertiary-no-background" size="normal">
-				<template #icon>
-					<DragVerticalIcon :size="20" />
-				</template>
-			</NcButton>
-		</DragHandle>
+		<FloatingButtons v-if="!isMobile && !isFullWidth" />
 		<EditorContent
 			role="document"
 			class="editor__content text-editor__content"
@@ -30,12 +24,12 @@
 </template>
 
 <script>
-import NcButton from '@nextcloud/vue/components/NcButton'
-import { DragHandle } from '@tiptap/extension-drag-handle-vue-2'
+import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
 import { EditorContent } from '@tiptap/vue-2'
-import DragVerticalIcon from 'vue-material-design-icons/DragVertical.vue'
 import { useEditor } from '../../composables/useEditor.ts'
+import { useEditorWidth } from '../../composables/useEditorWidth.ts'
 import EditorOutline from './EditorOutline.vue'
+import FloatingButtons from './FloatingButtons.vue'
 import { useOutlineStateMixin } from './Wrapper.provider.js'
 
 export default {
@@ -43,14 +37,14 @@ export default {
 	components: {
 		EditorContent,
 		EditorOutline,
-		NcButton,
-		DragHandle,
-		DragVerticalIcon,
+		FloatingButtons,
 	},
 	mixins: [useOutlineStateMixin],
 	setup() {
+		const isMobile = useIsMobile()
 		const { editor } = useEditor()
-		return { editor }
+		const { isFullWidth } = useEditorWidth()
+		return { editor, isMobile, isFullWidth }
 	},
 	computed: {
 		showOutline() {
@@ -72,12 +66,6 @@ export default {
 	}
 }
 
-.ie {
-	.editor__content:deep(.ProseMirror) {
-		padding-top: 50px;
-	}
-}
-
 .text-editor__content-wrapper {
 	--side-width: calc((100% - var(--text-editor-max-width)) / 2);
 	display: grid;
@@ -104,12 +92,4 @@ export default {
 		}
 	}
 }
-
-.drag-handle--button {
-	color: var(--color-maxcontrast);
-	position: absolute;
-	left: -60px;
-	transform: translate(0, -20%);
-	padding-right: 24px;
-}
 </style>
diff --git a/src/components/Editor/FloatingButtons.vue b/src/components/Editor/FloatingButtons.vue
new file mode 100644
index 00000000000..68f4f4dfa2a
--- /dev/null
+++ b/src/components/Editor/FloatingButtons.vue
@@ -0,0 +1,112 @@
+<!--
+  - SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<template>
+	<DragHandle
+		:editor="editor"
+		class="floating-buttons"
+		:class="{ heading: isHeadingNode }"
+		:on-node-change="onNodeChange">
+		<NcButton
+			type="tertiary-no-background"
+			size="small"
+			:title="t('text', 'Insert below')"
+			@click="onOpenSmartPicker">
+			<template #icon>
+				<PlusIcon :size="16" />
+			</template>
+		</NcButton>
+		<NcButton
+			type="tertiary-no-background"
+			size="small"
+			class="drag-button"
+			:title="t('text', 'Click for options, hold to drag')">
+			<template #icon>
+				<DragVerticalIcon :size="16" />
+			</template>
+		</NcButton>
+	</DragHandle>
+</template>
+
+<script>
+import { t } from '@nextcloud/l10n'
+import NcButton from '@nextcloud/vue/components/NcButton'
+import { DragHandle } from '@tiptap/extension-drag-handle-vue-2'
+import DragVerticalIcon from 'vue-material-design-icons/DragVertical.vue'
+import PlusIcon from 'vue-material-design-icons/Plus.vue'
+import { useEditor } from '../../composables/useEditor.ts'
+
+export default {
+	name: 'FloatingButtons',
+
+	components: {
+		DragHandle,
+		DragVerticalIcon,
+		NcButton,
+		PlusIcon,
+	},
+
+	setup() {
+		const { editor } = useEditor()
+		return { editor }
+	},
+
+	data() {
+		return {
+			node: null,
+			pos: -1,
+		}
+	},
+
+	computed: {
+		isHeadingNode() {
+			return this.node?.type === this.editor.schema.nodes.heading
+		},
+	},
+
+	methods: {
+		onNodeChange({ node, pos }) {
+			this.node = node
+			this.pos = pos
+		},
+		onOpenSmartPicker() {
+			if (!this.node || this.pos === -1) {
+				return
+			}
+
+			// Node has no children or just text children and no text content
+			const { schema } = this.editor
+			const emptyNode =
+				this.node.textContent.trim() === ''
+				&& (this.node.children.length === 0
+					|| this.node.children.every((n) => n.type === schema.nodes.text))
+
+			// Insert at the end of the node
+			const pos = emptyNode ? this.pos + 1 : this.pos + this.node.nodeSize
+			this.editor.chain().insertContentAt(pos, '/').focus().run()
+		},
+		t,
+	},
+}
+</script>
+
+<style scoped lang="scss">
+.floating-buttons {
+	display: flex;
+
+	&.heading {
+		margin-right: 16px;
+	}
+}
+
+.drag-button {
+	cursor: grab;
+
+	:deep(span),
+	:deep(svg) {
+		cursor: grab !important;
+	}
+}
+</style>
diff --git a/src/components/Editor/SmartPickerMenu.vue b/src/components/Editor/SmartPickerMenu.vue
deleted file mode 100644
index 7b2313bc773..00000000000
--- a/src/components/Editor/SmartPickerMenu.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<template>
-	<div contenteditable="false" class="smart-picker-menu-container">
-		<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 { t } from '@nextcloud/l10n'
-import NcButton from '@nextcloud/vue/components/NcButton'
-import PlusIcon from 'vue-material-design-icons/Plus.vue'
-
-export default {
-	name: 'SmartPickerMenu',
-	components: {
-		PlusIcon,
-		NcButton,
-	},
-	methods: {
-		t,
-	},
-}
-</script>
-<style lang="scss" scoped>
-div[contenteditable='false'] {
-	padding: 0;
-	margin: 0;
-}
-
-.smart-picker-menu-container {
-	position: absolute;
-	width: 0 !important;
-	left: -95px;
-	top: 50%;
-	transform: translate(0, -50%);
-}
-</style>
diff --git a/src/nodes/Paragraph.js b/src/nodes/Paragraph.js
index 665ed5c8621..468da5ec9c8 100644
--- a/src/nodes/Paragraph.js
+++ b/src/nodes/Paragraph.js
@@ -4,7 +4,6 @@
  */
 
 import TiptapParagraph from '@tiptap/extension-paragraph'
-import currentLineMenu from '../plugins/currentLineMenu.js'
 
 const Paragraph = TiptapParagraph.extend({
 	parseHTML() {
@@ -42,10 +41,6 @@ const Paragraph = TiptapParagraph.extend({
 			},
 		}
 	},
-
-	addProseMirrorPlugins() {
-		return [currentLineMenu({ editor: this.editor })]
-	},
 })
 
 export default Paragraph
diff --git a/src/nodes/Preview.vue b/src/nodes/Preview.vue
index 328719d48b8..deff784391d 100644
--- a/src/nodes/Preview.vue
+++ b/src/nodes/Preview.vue
@@ -79,6 +79,7 @@ export default {
 
 :deep(div.widgets--list a.widget-default) {
 	color: var(--color-main-text);
+	margin: 0;
 	padding: 0;
 	text-decoration: none;
 	max-width: calc(100vw - 156px);
diff --git a/src/plugins/currentLineMenu.js b/src/plugins/currentLineMenu.js
deleted file mode 100644
index 731bc4aa53b..00000000000
--- a/src/plugins/currentLineMenu.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { Editor } from '@tiptap/core'
-import { EditorState, Plugin, PluginKey, Transaction } from '@tiptap/pm/state'
-import { Decoration, DecorationSet } from '@tiptap/pm/view'
-import Vue from 'vue'
-import SmartPickerMenu from '../components/Editor/SmartPickerMenu.vue'
-
-export const currentLineMenuKey = new PluginKey('currentLineMenu')
-
-/**
- * Menu for the current line the cursor is on.
- * ProseMirror plugin providing a single decoration for the current line.
- *
- * @param {object} options - options for the plugin
- * @param {Editor} options.editor - the tiptap editor
- *
- * @return {Plugin<DecorationSet>}
- */
-export default function currentLineMenu({ editor }) {
-	return new Plugin({
-		key: currentLineMenuKey,
-
-		state: {
-			init(_, state) {
-				if (!editor.options.editable) {
-					return { decorations: DecorationSet.empty }
-				}
-				const currentParagraph = getCurrentParagraph(state)
-				return {
-					currentParagraph,
-					decorations: currentParagraphDecorations(
-						state.doc,
-						currentParagraph,
-						editor,
-					),
-				}
-			},
-			apply(tr, value, _oldState, newState) {
-				if (!editor.options.editable) {
-					return { decorations: DecorationSet.empty }
-				}
-				const currentParagraph = getCurrentParagraph(newState)
-				if (!currentParagraph) {
-					return { decorations: DecorationSet.empty }
-				}
-				const decorations =
-					mapDecorations(value, tr, currentParagraph)
-					|| currentParagraphDecorations(
-						newState.doc,
-						currentParagraph,
-						editor,
-					)
-				return { currentParagraph, decorations }
-			},
-		},
-
-		props: {
-			decorations(state) {
-				return this.getState(state).decorations
-			},
-		},
-	})
-}
-
-/**
- * Map the previous deocrations to current document state
- *
- * Return false if previewParagraphs changes or decorations would get removed. The latter prevents
- * lost decorations in case of replacements.
- *
- * @param {object} value - previous plugin state
- * @param {Transaction} tr - current transaction
- * @param {object|undefined} currentParagraph - attributes of the current paragraph
- *
- * @return {false|DecorationSet}
- */
-function mapDecorations(value, tr, currentParagraph) {
-	if (value.currentParagraph?.pos !== currentParagraph.pos) {
-		return false
-	}
-	let removedDecorations = false
-	const decorations = value.decorations.map(tr.mapping, tr.doc, {
-		onRemove: () => {
-			removedDecorations = true
-		},
-	})
-	return removedDecorations ? false : decorations
-}
-
-/**
- * Get the paragraph node the cursor is on.
- *
- * @param {EditorState} state - the prosemirror state
- * @return {object|undefined} - the current paragraph if the cursor is in one
- */
-function getCurrentParagraph({ selection }) {
-	const { parent, depth } = selection.$anchor
-	// handle invalid cursor position
-	if (depth > 1) {
-		return false
-	}
-	const pos = depth === 0 ? 0 : selection.$anchor.before()
-	const isRootDepth = depth === 1
-	const noLinkPickerYet = !parent.textContent.match(/(^| )\/$/)
-	if (
-		isRootDepth
-		&& noLinkPickerYet
-		&& selection.empty
-		&& parent.isTextblock
-		&& !parent.type.spec.code
-	) {
-		return { pos }
-	}
-}
-
-/**
- * Create a menu decorations for the given paragraph
- *
- * @param {Document} doc - prosemirror doc
- * @param {object} currentParagraph - paragraph to decorate
- * @param {Editor} editor - tiptap editor
- *
- * @return {DecorationSet}
- */
-function currentParagraphDecorations(doc, currentParagraph, editor) {
-	if (!currentParagraph) {
-		return DecorationSet.empty
-	}
-	const decorations = [decorationForCurrentParagraph(currentParagraph, editor)]
-	return DecorationSet.create(doc, decorations)
-}
-
-/**
- * Create a decoration for the currentParagraph
- *
- * @param {object} currentParagraph to decorate
- * @param {Editor} editor - tiptap editor
- *
- * @return {Decoration}
- */
-function decorationForCurrentParagraph(currentParagraph, editor) {
-	return Decoration.widget(
-		currentParagraph.pos + 1,
-		menuForCurrentParagraph(editor),
-		{ side: -1 },
-	)
-}
-
-/**
- * Create a menu element for the given currentParagraph
- *
- * @param {Editor} editor - tiptap editor
- *
- * @return {Element}
- */
-function menuForCurrentParagraph(editor) {
-	const el = document.createElement('div')
-	const Component = Vue.extend(SmartPickerMenu)
-	const menu = new Component()
-	menu.$mount(el)
-	menu.$on('open-smart-picker', () => {
-		const { selection } = editor.state
-		const { textContent } = selection.$anchor.parent
-		const eol = selection.$anchor.end()
-		const chain = editor.chain().focus().setTextSelection(eol)
-		if (textContent.trim() === '') {
-			chain.insertContent('/').run()
-		} else {
-			chain.splitBlock().insertContent('/').run()
-		}
-	})
-	return menu.$el
-}