diff --git a/cypress/README.md b/cypress/README.md
index e24a5bb4030..ea071e8fcb0 100644
--- a/cypress/README.md
+++ b/cypress/README.md
@@ -29,5 +29,8 @@ cy.getContent()
 | `getContent`         | Get editor content     |                                     |
 | `clearContent`       | Clear the editor content |                                   |
 | `getMenu`            | Get editor menu bar    |                                     |
+| `getMenuEntry`       | Same as `getActionEntry` but also searches the overflow menu | `name` |
+| `getSubmenuEntry`    | Open parent menu and then return sub menu entry | `parent`, `name` |
 | `getActionEntry`     | Get menu entry         | `name`                              |
+| `getActionSubEntry`  | Get submenu entry (after menu clicked) | `name`              |
 | `openWorkspace`      | Open workspace and return Editor content |                   |
diff --git a/cypress/e2e/links.spec.js b/cypress/e2e/links.spec.js
index a7d5694d510..2469b59c314 100644
--- a/cypress/e2e/links.spec.js
+++ b/cypress/e2e/links.spec.js
@@ -52,10 +52,9 @@ describe('test link marks', function() {
 				.then($el => {
 					const id = $el.data('id')
 
-					const link = `${Cypress.env('baseUrl')}/file-name?fileId=${id} `
-					cy.getContent()
-						.type('{enter}')
-						.type(link)
+					const link = `${Cypress.env('baseUrl')}/file-name?fileId=${id}`
+					cy.clearContent()
+						.type(`${link}{enter}`)
 
 					cy.getContent()
 						.find(`a[href*="${Cypress.env('baseUrl')}"]`)
@@ -67,16 +66,16 @@ describe('test link marks', function() {
 				})
 		})
 
-		it('whithout protocol', () => {
-			cy.getContent()
+		it('without protocol', () => {
+			cy.clearContent()
 				.type('google.com{enter}')
-
-			cy.getContent()
-				.find('a[href*="google.com"]')
-				.should('not.exist')
+				.then(() => cy.getContent()
+					.find('a[href*="google.com"]')
+					.should('not.exist')
+				)
 		})
 
-		it('whithout space', () => {
+		it('with protocol but without space', () => {
 			cy.getContent()
 				.type('https://nextcloud.com')
 
@@ -85,4 +84,83 @@ describe('test link marks', function() {
 				.should('not.exist')
 		})
 	})
+
+	describe('link menu', function() {
+		beforeEach(() => cy.clearContent())
+		const text = 'some text'
+
+		describe('link to website', function() {
+			const url = 'https://nextcloud.com/'
+			// Helper to reduce duplicated code, checking inserting with and without selected text
+			const checkLinkWebsite = (url, text) => {
+				cy.getSubmenuEntry('insert-link', 'insert-link-website').click()
+				cy.getActionSubEntry('insert-link-input').find('input[type="text"]').type(`${url}{enter}`)
+				cy.getContent()
+					.get(`a[href*="${url}"]`)
+					.should('have.text', text) // ensure correct text used
+					.click({ force: true })
+
+				cy.get('@winOpen')
+					.should('have.been.calledOnce')
+					.should('have.been.calledWith', url)
+			}
+
+			beforeEach(cy.clearContent)
+			it('Link website without selection', () => {
+				cy.getFile(fileName)
+					.then($el => {
+						checkLinkWebsite(url, url)
+					})
+			})
+
+			it('Link website with selection', () => {
+				cy.getFile(fileName)
+					.then($el => {
+						cy.getContent().type(`${text}{selectAll}`)
+						checkLinkWebsite(url, text)
+					})
+			})
+		})
+
+		describe('link to local file', function() {
+			// Helper to reduce duplicated code, checking inserting with and without selected text
+			const checkLinkFile = (filename, text) => {
+				cy.getSubmenuEntry('insert-link', 'insert-link-file').click()
+				cy.get('.oc-dialog').find(`tr[data-entryname="${filename}"]`).click()
+				cy.get('.oc-dialog').find('.oc-dialog-buttonrow > button').click()
+
+				return cy.getContent()
+					.find(`a[href*="${encodeURIComponent(filename)}"]`)
+					.should('have.text', text === undefined ? filename : text)
+					.click({ force: true })
+			}
+
+			beforeEach(() => cy.clearContent())
+
+			it('without text', () => {
+				cy.getFile(fileName)
+					.then($el => {
+						checkLinkFile(fileName)
+						cy.get('.modal-title').should('include.text', fileName)
+					})
+			})
+			it('with selected text', () => {
+				cy.getFile(fileName)
+					.then($el => {
+						cy.getContent().type(`${text}{selectAll}`)
+						checkLinkFile(fileName, text)
+						cy.get('.modal-title').should('include.text', fileName)
+					})
+			})
+			it('link to directory', () => {
+				cy.createFolder(`${window.__currentDirectory}/dummy folder`)
+				cy.getFile(fileName).then($el => {
+					cy.getContent().type(`${text}{selectAll}`)
+					checkLinkFile('dummy folder', text)
+					cy.get('@winOpen')
+						.should('have.been.calledOnce')
+				})
+			})
+		})
+	})
 })
diff --git a/cypress/e2e/sections.spec.js b/cypress/e2e/sections.spec.js
index 21bd7d4cd37..1fd595f910c 100644
--- a/cypress/e2e/sections.spec.js
+++ b/cypress/e2e/sections.spec.js
@@ -89,12 +89,14 @@ describe('Content Sections', () => {
 			// Create link to top heading
 			cy.clearContent()
 				.type('{selectAll}{backspace}move top\n{selectAll}')
-				.get('.menububble button[data-text-bubble-action="add-link"]')
-				.click({ force: true })
 				.then(() => {
-					cy.get('.menububble .menububble__input')
-						.type('{shift}')
-						.type('#top{enter}', { force: true })
+					cy.getSubmenuEntry('insert-link', 'insert-link-website')
+						.click()
+						.then(() => {
+							cy.getActionSubEntry('insert-link-input')
+								.find('input[type="text"]')
+								.type('#top{enter}')
+						})
 				})
 			// Insert content above link
 			cy.getContent()
diff --git a/cypress/e2e/workspace.spec.js b/cypress/e2e/workspace.spec.js
index 57547f1b455..e82bc1a0294 100644
--- a/cypress/e2e/workspace.spec.js
+++ b/cypress/e2e/workspace.spec.js
@@ -63,45 +63,18 @@ describe('Workspace', function() {
 			['underline', 'u'],
 			['strikethrough', 's'],
 		].forEach(([button, tag]) => {
-			menuButton(button)
+			cy.getMenuEntry(button)
 				.click({ force: true })
 				.should('have.class', 'is-active')
 			cy.getContent()
 				.find(`${tag}`)
 				.should('contain', 'Format me')
-			menuButton(button)
+			cy.getMenuEntry(button)
 				.click({ force: true })
 				.should('not.have.class', 'is-active')
 		})
 	})
 
-	it('links via menububble', function() {
-		cy.openWorkspace()
-			.type('Nextcloud')
-			.type('{selectall}')
-		menuBubbleButton('add-link').click()
-		cy.get('.menububble input').type('https://nextcloud.com{enter}')
-		cy.getContent()
-			.find('a')
-			.should('contain', 'Nextcloud')
-			.should('be.visible')
-		cy.getContent()
-			.find('a').invoke('attr', 'href')
-			.should('include', 'https://nextcloud.com')
-		cy.window().then((win) => {
-			cy.stub(win, 'open').as('windowOpen')
-		})
-		cy.getContent()
-			.find('a').click()
-		cy.get('@windowOpen').should('be.calledWith', 'https://nextcloud.com/')
-		cy.getContent().type('{selectall}')
-		menuBubbleButton('add-link').click()
-		cy.get('.menububble input').type('/team{enter}')
-		cy.getContent()
-			.find('a').click()
-		cy.get('@windowOpen').should('be.calledWith', 'https://nextcloud.com/team')
-	})
-
 	it('creates headings via submenu', function() {
 		cy.openWorkspace()
 			.type('Heading')
@@ -109,17 +82,17 @@ describe('Workspace', function() {
 		;['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].forEach((heading) => {
 			const actionName = `headings-${heading}`
 
-			getSubmenuItem('headings', actionName).click()
+			cy.getSubmenuEntry('headings', actionName).click()
 
 			cy.getContent()
 				.find(`${heading}`)
 				.should('contain', 'Heading')
 
-			getSubmenuItem('headings', actionName)
+			cy.getSubmenuEntry('headings', actionName)
 				.should('have.class', 'is-active')
 				.click()
 
-			menuButton('headings').should('not.have.class', 'is-active')
+			cy.getMenuEntry('headings').should('not.have.class', 'is-active')
 		})
 	})
 
@@ -132,14 +105,14 @@ describe('Workspace', function() {
 			['ordered-list', 'ol'],
 			['task-list', 'ul[data-type="taskList"]'],
 		].forEach(([button, tag]) => {
-			menuButton(button)
+			cy.getMenuEntry(button)
 				.click({ force: true })
 				.should('have.class', 'is-active')
 
 			cy.getContent()
 				.find(`${tag}`).should('contain', 'List me')
 
-			menuButton(button)
+			cy.getMenuEntry(button)
 				.click({ force: true })
 				.should('not.have.class', 'is-active')
 		})
@@ -157,7 +130,7 @@ describe('Workspace', function() {
 		cy.openWorkspace()
 			.type('# Let\'s smile together{enter}## ')
 
-		menuButton('emoji-picker')
+		cy.getMenuEntry('emoji-picker')
 			.click()
 
 		cy.get('#emoji-mart-list button[aria-label="😀, grinning"]')
@@ -187,7 +160,7 @@ describe('Workspace', function() {
 				const actionName = `callout-${type}`
 
 				// enable callout
-				getSubmenuItem('callouts', actionName)
+				cy.getSubmenuEntry('callouts', actionName)
 					.click()
 					.then(() => {
 						// check content
@@ -196,7 +169,7 @@ describe('Workspace', function() {
 							.should('contain', 'Callout')
 
 						// disable
-						return getSubmenuItem('callouts', actionName)
+						return cy.getSubmenuEntry('callouts', actionName)
 							.should('have.class', 'is-active')
 							.click()
 					})
@@ -209,13 +182,13 @@ describe('Workspace', function() {
 			let last = first
 
 			// enable callout
-			getSubmenuItem('callouts', `callout-${first}`)
+			cy.getSubmenuEntry('callouts', `callout-${first}`)
 				.click()
 
 			cy.wrap(rest)
 				.each(type => {
 					const actionName = `callout-${type}`
-					return getSubmenuItem('callouts', actionName)
+					return cy.getSubmenuEntry('callouts', actionName)
 						.click()
 						.then(() => cy.getContent().find(`.callout.callout--${type}`))
 						.should('contain', 'Callout')
@@ -224,10 +197,10 @@ describe('Workspace', function() {
 						})
 				})
 				.then(() => {
-					getSubmenuItem('callouts', `callout-${last}`)
+					cy.getSubmenuEntry('callouts', `callout-${last}`)
 						.click()
 
-					menuButton('callouts')
+					cy.getMenuEntry('callouts')
 						.should('not.have.class', 'is-active')
 				})
 		})
@@ -287,23 +260,6 @@ describe('Workspace', function() {
 	})
 })
 
-const menuButton = (name) => {
-	return cy.getActionEntry(name)
-}
-
-const submenuButton = (name) => {
-	return cy.get('.v-popper__wrapper .open').getActionEntry(name)
-}
-
-const menuBubbleButton = (name) => {
-	return cy.get('[data-text-el="menu-bubble"]').find(`[data-text-bubble-action="${name}"]`)
-}
-
-const getSubmenuItem = (parent, item) => {
-	menuButton(parent).click()
-	return submenuButton(item)
-}
-
 const openSidebar = filename => {
 	cy.get(`.files-fileList tr[data-file="${filename}"]`)
 		.should('contain', filename)
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 2df78beb3c7..d9632335d37 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -173,6 +173,7 @@ Cypress.Commands.add('isolateTest', ({ sourceFile = 'text.md', targetFile = null
 	cy.createFolder(folderName)
 	cy.uploadFile(sourceFile, 'text/markdown', `${encodeURIComponent(folderName)}/${targetFile}`)
 
+	window.__currentDirectory = folderName
 	return cy.visit(`apps/files?dir=/${encodeURIComponent(folderName)}`, { onBeforeLoad })
 		.then(() => ({ folderName, fileName: targetFile }))
 })
@@ -294,11 +295,32 @@ Cypress.Commands.add('getMenu', { prevSubject: 'optional' }, (subject) => {
 		.find('[data-text-el="menubar"]')
 })
 
+// Get menu entry even if moved into overflow menu
+Cypress.Commands.add('getMenuEntry', (name) => {
+	cy.getMenu().then(($body) => {
+		if ($body.find(`[data-text-action-entry="${name}"]`).length) {
+			return cy.getActionEntry(name)
+		}
+		return cy.getSubmenuEntry('remain', name)
+	})
+})
+
+Cypress.Commands.add('getSubmenuEntry', { prevSubject: 'optional' }, (subject, parent, name) => {
+	return (subject ? cy.wrap(subject) : cy.getMenu())
+		.getActionEntry(parent)
+		.click()
+		.then(() => cy.getActionSubEntry(name))
+})
+
 Cypress.Commands.add('getActionEntry', { prevSubject: 'optional' }, (subject, name) => {
 	return (subject ? cy.wrap(subject) : cy.getMenu())
 		.find(`[data-text-action-entry="${name}"]`)
 })
 
+Cypress.Commands.add('getActionSubEntry', (name) => {
+	return cy.get('.action-item__popper .open').getActionEntry(name)
+})
+
 Cypress.Commands.add('getContent', { prevSubject: 'optional' }, (subject) => {
 	return (subject ? cy.wrap(subject) : cy.getEditor())
 		.find('.ProseMirror')
@@ -315,7 +337,10 @@ Cypress.Commands.add('getTOC', () => {
 Cypress.Commands.add('clearContent', () => {
 	return cy.getContent()
 		.scrollIntoView()
-		.type('{selectAll}{backspace}', { force: true })
+		.then(() => cy.getContent()
+			.type('{selectAll}{backspace}')
+		)
+		.then(() => cy.getContent())
 })
 
 Cypress.Commands.add('openWorkspace', () => {
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index f849ee69290..2829045d95a 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -55,11 +55,7 @@
 					<div v-else class="menubar-placeholder" />
 				</template>
 				<ContentContainer v-show="contentLoaded"
-					ref="contentWrapper">
-					<MenuBubble v-if="renderMenus"
-						:content-wrapper="contentWrapper"
-						:file-path="relativePath" />
-				</ContentContainer>
+					ref="contentWrapper" />
 			</MainContainer>
 			<Reader v-if="hasSyncCollission"
 				:content="syncError.data.outsideChange"
@@ -123,7 +119,6 @@ export default {
 		ReadonlyBar,
 		ContentContainer,
 		MenuBar,
-		MenuBubble: () => import(/* webpackChunkName: "editor-rich" */'./MenuBubble.vue'),
 		Reader: () => import(/* webpackChunkName: "editor" */'./Reader.vue'),
 		Status,
 		CollisionResolveDialog: () => import(/* webpackChunkName: "editor" */'./CollisionResolveDialog.vue'),
diff --git a/src/components/Menu/ActionInsertLink.vue b/src/components/Menu/ActionInsertLink.vue
new file mode 100644
index 00000000000..4b75ec1734e
--- /dev/null
+++ b/src/components/Menu/ActionInsertLink.vue
@@ -0,0 +1,211 @@
+<!--
+  - @copyright Copyright (c) 2022
+  -
+  - @license AGPL-3.0-or-later
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+<template>
+	<NcActions ref="menu"
+		class="entry-action entry-action__insert-link"
+		aria-haspopup
+		:aria-label="actionEntry.label"
+		:class="activeClass"
+		:container="menuIDSelector"
+		:data-text-action-entry="actionEntry.key"
+		:title="actionEntry.label">
+		<template #icon>
+			<component :is="icon"
+				:title="actionEntry.label"
+				:aria-label="actionEntry.label"
+				aria-haspopup />
+		</template>
+		<NcActionButton v-if="state.active"
+			close-after-click
+			:data-text-action-entry="`${actionEntry.key}-remove`"
+			@click="removeLink">
+			<template #icon>
+				<LinkOff />
+			</template>
+			{{ t('text', 'Remove link') }}
+		</NcActionButton>
+		<NcActionButton close-after-click
+			:data-text-action-entry="`${actionEntry.key}-file`"
+			@click="linkFile">
+			<template #icon>
+				<Document />
+			</template>
+			{{ t('text', 'Link to file or folder') }}
+		</NcActionButton>
+		<NcActionInput v-if="isInputMode"
+			type="text"
+			:value="href"
+			:data-text-action-entry="`${actionEntry.key}-input`"
+			@submit="linkWebsite">
+			<template #icon>
+				<Web />
+			</template>
+			{{ t('text', 'Link to website') }}
+		</NcActionInput>
+		<NcActionButton v-else
+			:data-text-action-entry="`${actionEntry.key}-website`"
+			@click="linkWebsite">
+			<template #icon>
+				<Web />
+			</template>
+			{{ state.active ? t('text', 'Update link') : t('text', 'Link to website') }}
+		</NcActionButton>
+	</NcActions>
+</template>
+
+<script>
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
+
+import { getMarkAttributes, isActive } from '@tiptap/core'
+
+import { Document, Loading, LinkOff, Web } from '../icons.js'
+import { BaseActionEntry } from './BaseActionEntry.js'
+import { optimalPath } from '../../helpers/files.js'
+import { useFileMixin } from '../Editor.provider.js'
+import { useMenuIDMixin } from './MenuBar.provider.js'
+
+export default {
+	name: 'ActionInsertLink',
+	components: {
+		NcActions,
+		NcActionButton,
+		NcActionInput,
+		Document,
+		Loading,
+		LinkOff,
+		Web,
+	},
+	extends: BaseActionEntry,
+	mixins: [
+		useFileMixin,
+		useMenuIDMixin,
+	],
+	data: () => {
+		return {
+			href: null,
+			isInputMode: false,
+		}
+	},
+	computed: {
+		activeClass() {
+			return this.state.active ? 'is-active' : ''
+		},
+	},
+	methods: {
+		/**
+		 * Open dialog and ask user which file to link to
+		 * Triggered by the "link file" button
+		 */
+		linkFile() {
+				t('text', 'Select file or folder to link to'),
+				const client = OC.Files.getClient()
+				client.getFileInfo(file).then((_status, fileInfo) => {
+					const path = optimalPath(this.$file.relativePath, `${fileInfo.path}/${fileInfo.name}`)
+					const encodedPath = path.split('/').map(encodeURIComponent).join('/') + (fileInfo.type === 'dir' ? '/' : '')
+					const href = `${encodedPath}?fileId=${fileInfo.id}`
+					this.setLink(href, fileInfo.name)
+				})
+			}, false, [], true, 1, startPath, { allowDirectoryChooser: true })
+		},
+		/**
+		 * Allow user to enter an URL manually
+		 * Triggered when by the "link url" button
+		 *
+		 * @param {Event} event Triggering event
+		 */
+		linkWebsite(event) {
+			if (event?.type === 'submit') {
+				const href = [...event.target.elements].filter(e => e?.type === 'text')[0].value
+				// Close menu manually as autoclose does not work form ActionInput
+				this.$refs.menu.closeMenu()
+				this.isInputMode = false
+				this.href = null
+				return this.setLink(href, href)
+			}
+
+			if (isActive(this.$editor.state, 'link')) {
+				const attrs = getMarkAttributes(this.$editor.state, 'link')
+				this.href = attrs.href
+			}
+			this.isInputMode = true
+		},
+		/**
+		 * Save user entered URL as a link markup
+		 * Triggered when the user submits the ActionInput
+		 *
+		 * @param {string} url href attribute of the link
+		 * @param {string} text Text part of the link
+		 */
+		setLink(url, text) {
+			// Heuristics for determining if we need a https:// prefix.
+			const noPrefixes = [
+				/^[a-zA-Z]+:/, // url with protocol ("mailTo:email@domain.tld")
+				/^\//, // absolute path
+				/\?fileId=/, // relative link with fileId
+				/^\.\.?\//, // relative link starting with ./ or ../
+				/^[^.]*[/$]/, // no dots before first '/' - not a domain name
+				/^#/, // url fragment
+			]
+			if (url && !noPrefixes.find(regex => url.match(regex))) {
+				url = 'https://' + url
+			}
+
+			// Avoid issues when parsing urls later on in markdown that might be entered in an invalid format (e.g. "mailto: example@example.com")
+			const href = url.replaceAll(' ', '%20')
+			const chain = this.$editor.chain()
+			// Check if any text is selected, if not insert the lunk using the given text property
+			if (this.$editor.view.state?.selection.empty) {
+				chain.insertContent({
+					type: 'paragraph',
+					content: [{
+						type: 'text',
+						marks: [{
+							type: 'link',
+							attrs: {
+								href,
+							},
+						}],
+						text,
+					}],
+				})
+			} else {
+				chain.setLink({ href })
+			}
+			chain.focus().run()
+		},
+		/**
+		 * Remove link markup at current position
+		 * Triggered by the "remove link" button
+		 */
+		removeLink() {
+			this.$editor.chain().unsetLink().focus().run()
+		},
+	},
+}
+</script>
+
+<style scoped>
+	.action {
+		/* to unify width of ActionInput and ActionButton */
+		min-width: 218px;
+	}
+</style>
diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index 4f620ce05f5..879ef428297 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -236,7 +236,7 @@ export default {
 		--background-blur: blur(10px);
 		position: sticky;
 		top: 0;
-		z-index: 10021; // above modal-header and menububble so menubar is always on top
+		z-index: 10021; // above modal-header so menubar is always on top
 		background-color: var(--color-main-background-translucent);
 		backdrop-filter: var(--background-blur);
 		max-height: 44px; // important for mobile so that the buttons are always inside the container
diff --git a/src/components/Menu/entries.js b/src/components/Menu/entries.js
index 3b41f4ccd47..ad882f9a9f2 100644
--- a/src/components/Menu/entries.js
+++ b/src/components/Menu/entries.js
@@ -23,6 +23,9 @@
 import {
 	Undo,
 	Redo,
+	CodeTags,
+	Danger,
+	Emoticon,
 	FormatBold,
 	FormatItalic,
 	FormatUnderline,
@@ -37,17 +40,16 @@ import {
 	FormatListBulleted,
 	FormatListCheckbox,
 	FormatQuote,
+	Images,
 	Info,
+	LinkIcon,
 	Positive,
-	Warn,
-	Danger,
-	CodeTags,
 	Table,
-	Emoticon,
-	Images,
+	Warn,
 } from '../icons.js'
 import EmojiPickerAction from './EmojiPickerAction.vue'
 import ActionAttachmentUpload from './ActionAttachmentUpload.vue'
+import ActionInsertLink from './ActionInsertLink.vue'
 
 import { MODIFIERS } from './keys.js'
 
@@ -71,7 +73,7 @@ export default [
 		keyModifiers: [MODIFIERS.Mod],
 		icon: Undo,
 		action: (command) => command.undo(),
-		priority: 5,
+		priority: 6,
 	},
 	{
 		key: 'redo',
@@ -80,7 +82,7 @@ export default [
 		keyModifiers: [MODIFIERS.Mod],
 		icon: Redo,
 		action: (command) => command.redo(),
-		priority: 11,
+		priority: 12,
 	},
 	{
 		key: 'bold',
@@ -92,7 +94,7 @@ export default [
 		action: (command) => {
 			return command.toggleBold()
 		},
-		priority: 6,
+		priority: 7,
 	},
 	{
 		key: 'italic',
@@ -104,7 +106,7 @@ export default [
 		action: (command) => {
 			return command.toggleItalic()
 		},
-		priority: 7,
+		priority: 8,
 	},
 	{
 		key: 'underline',
@@ -116,7 +118,7 @@ export default [
 		action: (command) => {
 			return command.toggleUnderline()
 		},
-		priority: 14,
+		priority: 15,
 	},
 	{
 		key: 'strikethrough',
@@ -128,7 +130,7 @@ export default [
 		action: (command) => {
 			return command.toggleStrike()
 		},
-		priority: 15,
+		priority: 16,
 	},
 	{
 		key: 'headings',
@@ -218,7 +220,7 @@ export default [
 		action: (command) => {
 			return command.toggleBulletList()
 		},
-		priority: 8,
+		priority: 9,
 	},
 	{
 		key: 'ordered-list',
@@ -230,7 +232,7 @@ export default [
 		action: (command) => {
 			return command.toggleOrderedList()
 		},
-		priority: 9,
+		priority: 10,
 	},
 	{
 		key: 'task-list',
@@ -240,7 +242,15 @@ export default [
 		isActive: 'taskList',
 		icon: FormatListCheckbox,
 		action: (command) => command.toggleTaskList(),
-		priority: 10,
+		priority: 11,
+	},
+	{
+		key: 'insert-link',
+		label: t('text', 'Insert link'),
+		isActive: 'link',
+		icon: LinkIcon,
+		component: ActionInsertLink,
+		priority: 2,
 	},
 	{
 		key: 'blockquote',
@@ -252,7 +262,7 @@ export default [
 		action: (command) => {
 			return command.toggleBlockquote()
 		},
-		priority: 12,
+		priority: 13,
 	},
 	{
 		key: 'callouts',
@@ -310,7 +320,7 @@ export default [
 		action: (command) => {
 			return command.toggleCodeBlock()
 		},
-		priority: 13,
+		priority: 14,
 	},
 	{
 		key: 'table',
@@ -320,7 +330,7 @@ export default [
 		action: (command) => {
 			return command.insertTable()
 		},
-		priority: 16,
+		priority: 17,
 	},
 	{
 		key: 'emoji-picker',
@@ -330,13 +340,13 @@ export default [
 		action: (command, emojiObject = {}) => {
 			return command.emoji(emojiObject)
 		},
-		priority: 4,
+		priority: 5,
 	},
 	{
 		key: 'insert-attachment',
 		label: t('text', 'Insert attachment'),
 		icon: Images,
 		component: ActionAttachmentUpload,
-		priority: 2,
+		priority: 4,
 	},
 ]
diff --git a/src/components/MenuBubble.vue b/src/components/MenuBubble.vue
deleted file mode 100644
index 168fbd6d08d..00000000000
--- a/src/components/MenuBubble.vue
+++ /dev/null
@@ -1,246 +0,0 @@
-<!--
-  - @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net>
-  -
-  - @author Julius Härtl <jus@bitgrid.net>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -
-  -->
-
-<template>
-	<BubbleMenu :editor="$editor"
-		:tippy-options="{ onHide: hideLinkMenu, duration: 200, placement: 'bottom' }"
-		data-text-el="menu-bubble"
-		class="menububble">
-		<form v-if="linkMenuIsActive" class="menububble__form" @submit.prevent="setLinkUrl()">
-			<input ref="linkInput"
-				v-model="linkUrl"
-				class="menububble__input"
-				type="text"
-				placeholder="https://"
-				@keydown.esc="hideLinkMenu">
-			<button class="menububble__button"
-				data-text-bubble-action="confirm"
-				type="button"
-				tabindex="0"
-				@click="setLinkUrl()">
-				<Check />
-			</button>
-		</form>
-
-		<template v-else>
-			<button class="menububble__button"
-				data-text-bubble-action="add-link"
-				:class="{ 'is-active': isActive }"
-				@click="showLinkMenu()">
-				<LinkIcon />
-				<span class="menububble__buttontext">
-					{{ isActive ? t('text', 'Update Link') : t('text', 'Add Link') }}
-				</span>
-			</button>
-			<button v-if="!isUsingDirectEditing"
-				data-text-bubble-action="add-file"
-				class="menububble__button"
-				:class="{ 'is-active': isActive }"
-				@click="selectFile()">
-				<Document />
-				<span class="menububble__buttontext">{{ t('text', 'Link file') }}</span>
-			</button>
-			<button v-if="isActive"
-				class="menububble__button"
-				data-text-bubble-action="remove-link"
-				:class="{ 'is-active': isActive }"
-				@click="removeLinkUrl()">
-				<Delete />
-				<span class="menububble__buttontext">
-					{{ t('text', 'Remove Link') }}
-				</span>
-			</button>
-		</template>
-	</BubbleMenu>
-</template>
-
-<script>
-import debounce from 'debounce'
-import { BubbleMenu } from '@tiptap/vue-2'
-import { getMarkAttributes } from '@tiptap/core'
-import { getCurrentUser } from '@nextcloud/auth'
-import { loadState } from '@nextcloud/initial-state'
-import { Tooltip } from '@nextcloud/vue'
-import { optimalPath } from './../helpers/files.js'
-
-import { useEditorMixin } from './Editor.provider.js'
-
-import { LinkIcon, Document, Delete, Check } from '../components/icons.js'
-
-export default {
-	name: 'MenuBubble',
-	components: {
-		BubbleMenu,
-		LinkIcon,
-		Document,
-		Delete,
-		Check,
-	},
-	directives: {
-		tooltip: Tooltip,
-	},
-	mixins: [useEditorMixin],
-	props: {
-		// used to calculate the position based on the scrollOffset
-		contentWrapper: {
-			type: HTMLDivElement,
-			required: false,
-			default: null,
-		},
-		filePath: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-	data: () => {
-		return {
-			isActive: false,
-			linkUrl: null,
-			linkMenuIsActive: false,
-			isUsingDirectEditing: loadState('text', 'directEditingToken', null) !== null,
-		}
-	},
-	mounted() {
-		this.$_updateIsActive = debounce(this.updateIsActive.bind(this), 50)
-		this.$editor.on('update', this.$_updateIsActive)
-		this.$editor.on('selectionUpdate', this.$_updateIsActive)
-	},
-	beforeDestroy() {
-		this.$editor.off('update', this.$_updateIsActive)
-		this.$editor.off('selectionUpdate', this.$_updateIsActive)
-	},
-	methods: {
-		showLinkMenu() {
-			const attrs = getMarkAttributes(this.$editor.state, 'link')
-			this.linkUrl = attrs.href
-			this.linkMenuIsActive = true
-			this.$nextTick(() => {
-				this.$refs.linkInput.focus()
-			})
-		},
-		hideLinkMenu() {
-			this.linkUrl = null
-			this.linkMenuIsActive = false
-		},
-		selectFile() {
-			const currentUser = getCurrentUser()
-			if (!currentUser) {
-				return
-			}
-			const startPath = this.filePath.split('/').slice(0, -1).join('/')
-			OC.dialogs.filepicker(t('text', 'Select file to link to'), (file) => {
-				const client = OC.Files.getClient()
-				client.getFileInfo(file).then((_status, fileInfo) => {
-					const path = optimalPath(this.filePath, `${fileInfo.path}/${fileInfo.name}`)
-					const encodedPath = path.split('/').map(encodeURIComponent).join('/')
-					const href = `${encodedPath}?fileId=${fileInfo.id}`
-					this.$editor.chain().setLink({ href }).focus().run()
-					this.hideLinkMenu()
-				})
-			}, false, [], true, undefined, startPath)
-		},
-		setLinkUrl() {
-			let url = this.linkUrl
-			// Heuristics for determining if we need a https:// prefix.
-			const noPrefixes = [
-				/^[a-zA-Z]+:/, // url with protocol ("mailTo:email@domain.tld")
-				/^\//, // absolute path
-				/\?fileId=/, // relative link with fileId
-				/^\.\.?\//, // relative link starting with ./ or ../
-				/^[^.]*[/$]/, // no dots before first '/' - not a domain name
-				/^#/, // url fragment
-			]
-			if (url && !noPrefixes.find(regex => url.match(regex))) {
-				url = 'https://' + url
-			}
-
-			// Avoid issues when parsing urls later on in markdown that might be entered in an invalid format (e.g. "mailto: example@example.com")
-			const href = url.replaceAll(' ', '%20')
-			this.$editor.chain().setLink({ href }).focus().run()
-			this.hideLinkMenu()
-		},
-		removeLinkUrl() {
-			this.$editor.chain().unsetLink().focus().run()
-		},
-		updateIsActive() {
-			this.isActive = this.$editor.isActive('link')
-		},
-	},
-}
-</script>
-
-<style scoped lang="scss">
-	.menububble {
-		display: flex;
-		z-index: 10020;
-		background: var(--color-main-background-translucent);
-		box-shadow: 0 1px 5px var(--color-box-shadow);
-		border-radius: var(--border-radius-large);
-		overflow: hidden;
-		padding: 0;
-		margin-left: 10px;
-		height: 44px;
-
-		&__button {
-			flex-grow: 1;
-			border: 0;
-			padding: 0.9rem 0.7rem;
-			margin: 0;
-			border-radius: 0;
-			cursor: pointer;
-			background-color: var(--color-main-background);
-			border-right: 1px solid var(--color-border);
-			display: flex;
-			align-items: center;
-
-			&:focus,
-			&:hover {
-				background-color: var(--color-background-hover);
-				border: 0;
-				border-right: 1px solid var(--color-border) !important;
-			}
-
-			&:last-child {
-				border: 0 !important;
-			}
-		}
-
-		&__buttontext {
-			padding: 0.4rem;
-			padding-right: 0;
-		}
-
-		&__form {
-			display: flex;
-			align-items: center;
-		}
-
-		&__input {
-			font: inherit;
-			border: none;
-			background: transparent;
-			min-width: 250px;
-			margin: 0 0.5em 0 1em;
-		}
-	}
-</style>
diff --git a/src/components/icons.js b/src/components/icons.js
index b7f8beab0ce..895d0f3848c 100644
--- a/src/components/icons.js
+++ b/src/components/icons.js
@@ -50,6 +50,7 @@ import MDI_Image from 'vue-material-design-icons/ImageOutline.vue'
 import MDI_Images from 'vue-material-design-icons/ImageMultipleOutline.vue'
 import MDI_Info from 'vue-material-design-icons/Information.vue'
 import MDI_Link from 'vue-material-design-icons/Link.vue'
+import MDI_LinkOff from 'vue-material-design-icons/LinkOff.vue'
 import MDI_Loading from 'vue-material-design-icons/Loading.vue'
 import MDI_Lock from 'vue-material-design-icons/Lock.vue'
 import MDI_Positive from 'vue-material-design-icons/CheckboxMarkedCircle.vue'
@@ -64,6 +65,7 @@ import MDI_TrashCan from 'vue-material-design-icons/TrashCan.vue'
 import MDI_Undo from 'vue-material-design-icons/ArrowULeftTop.vue'
 import MDI_Upload from 'vue-material-design-icons/Upload.vue'
 import MDI_Warn from 'vue-material-design-icons/Alert.vue'
+import MDI_Web from 'vue-material-design-icons/Web.vue'
 
 const DEFAULT_ICON_SIZE = 20
 
@@ -119,6 +121,7 @@ export const Image = makeIcon(MDI_Image)
 export const Images = makeIcon(MDI_Images)
 export const Info = makeIcon(MDI_Info)
 export const LinkIcon = makeIcon(MDI_Link)
+export const LinkOff = makeIcon(MDI_LinkOff)
 export const Lock = makeIcon(MDI_Lock)
 export const Positive = makeIcon(MDI_Positive)
 export const Redo = makeIcon(MDI_Redo)
@@ -132,3 +135,4 @@ export const TrashCan = makeIcon(MDI_TrashCan)
 export const Undo = makeIcon(MDI_Undo)
 export const Upload = makeIcon(MDI_Upload)
 export const Warn = makeIcon(MDI_Warn)
+export const Web = makeIcon(MDI_Web)
diff --git a/src/helpers/files.js b/src/helpers/files.js
index 13805352887..7b603615416 100644
--- a/src/helpers/files.js
+++ b/src/helpers/files.js
@@ -36,6 +36,10 @@ const optimalPath = function(from, to) {
 	while (current[0] === target[0]) {
 		current.shift()
 		target.shift()
+		// Handle case where target is the current directory
+		if (current.length === 0 && target.length === 0) {
+			return '.'
+		}
 	}
 	const relativePath = current.fill('..').concat(target)
 	const absolutePath = to.split('/')
diff --git a/src/helpers/links.js b/src/helpers/links.js
index f7fd977de23..99088a307c8 100644
--- a/src/helpers/links.js
+++ b/src/helpers/links.js
@@ -66,8 +66,14 @@ const domHref = function(node) {
 		const [, relPath, id] = match
 		const currentDir = basedir(OCA.Viewer.file)
 		const dir = absolutePath(currentDir, basedir(relPath))
-		return generateUrl(`/apps/files/?dir=${dir}&openfile=${id}#relPath=${relPath}`)
+		if (relPath.length > 1 && relPath.endsWith('/')) {
+			// is directory
+			return generateUrl(`/apps/files/?dir=${dir}&fileId=${id}`)
+		} else {
+			return generateUrl(`/apps/files/?dir=${dir}&openfile=${id}#relPath=${relPath}`)
+		}
 	}
+	return ref
 }
 
 const parseHref = function(dom) {
@@ -103,7 +109,7 @@ const openLink = function(event, _attrs) {
 	}
 	if (query?.fileId) {
 		// open the direct file link
-		window.open(generateUrl(`/f/${query.fileId}`))
+		window.open(generateUrl(`/f/${query.fileId}`), '_self')
 		return
 	}
 	if (!markdownit.validateLink(htmlHref)) {
diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
index 2667a3a05d6..06916d1bfa3 100644
--- a/src/views/RichWorkspace.vue
+++ b/src/views/RichWorkspace.vue
@@ -279,7 +279,7 @@ export default {
 		overflow: scroll !important;
 		max-height: calc(40vh - 50px);
 		padding-left: 10px;
-		padding-bottom: 60px; /* ensure menububble fits below */
+		padding-bottom: 10px;
 	}
 
 	#rich-workspace:deep(.text-editor__wrapper .ProseMirror) {