diff --git a/webapp/components/Editor/ContextMenu.vue b/webapp/components/Editor/ContextMenu.vue
index 4297cf971..d0cf4c087 100644
--- a/webapp/components/Editor/ContextMenu.vue
+++ b/webapp/components/Editor/ContextMenu.vue
@@ -7,13 +7,13 @@ export default {
     node: Object,
   },
   methods: {
-    displayContextMenu(target, content) {
+    displayContextMenu(target, content, trigger) {
       if (this.menu) {
         return
       }
       this.menu = tippy(target, {
         content: content,
-        trigger: 'mouseenter',
+        trigger: trigger || 'mouseenter',
         interactive: true,
         theme: 'dark',
         placement: 'top-start',
diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 9e1787862..63f948e7e 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="editor">
+    <menu-bar :editor="editor" :showLinkMenu="showLinkMenu" />
+    <editor-content ref="editor" :editor="editor" />
+    <context-menu ref="contextMenu" />
     <suggestions-menu
       :showSuggestions="showSuggestions"
       ref="suggestions"
@@ -11,44 +14,7 @@
       :is-hashtag="isHashtag"
       :has-results="hasResults"
     />
-    <editor-menu-bubble :editor="editor">
-      <div
-        ref="menu"
-        slot-scope="{ commands, getMarkAttrs, isActive, menu }"
-        class="menububble tooltip"
-        x-placement="top"
-        :class="{ 'is-active': menu.isActive || linkMenuIsActive }"
-        :style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`"
-      >
-        <div class="tooltip-wrapper">
-          <template v-if="linkMenuIsActive">
-            <ds-input
-              ref="linkInput"
-              v-model="linkUrl"
-              class="editor-menu-link-input"
-              placeholder="http://"
-              @blur.native.capture="hideMenu(menu.isActive)"
-              @keydown.native.esc.prevent="hideMenu(menu.isActive)"
-              @keydown.native.enter.prevent="setLinkUrl(commands.link, linkUrl)"
-            />
-          </template>
-          <template v-else>
-            <button
-              class="menububble__button"
-              @click="showLinkMenu(getMarkAttrs('link'))"
-              :class="{ 'is-active': isActive.link() }"
-            >
-              <span>{{ isActive.link() ? 'Update Link' : 'Add Link' }}</span>
-              <ds-icon name="link" />
-            </button>
-          </template>
-        </div>
-        <div class="tooltip-arrow" />
-      </div>
-    </editor-menu-bubble>
-    <menu-bar :editor="editor" :showLinkMenu="showLinkMenu" />
-    <editor-content ref="editor" :editor="editor" />
-    <context-menu ref="contextMenu" />
+    <link-input v-show="linkMenuIsActive" ref="linkMenu" :editorCommand="editor.commands.link" />
   </div>
 </template>
 
@@ -57,25 +23,26 @@ import defaultExtensions from './defaultExtensions.js'
 import linkify from 'linkify-it'
 import stringHash from 'string-hash'
 import Fuse from 'fuse.js'
-import { Editor, EditorContent, EditorMenuBubble } from 'tiptap'
+import { Editor, EditorContent } from 'tiptap'
 import EventHandler from './plugins/eventHandler.js'
 import { History } from 'tiptap-extensions'
 import Hashtag from './nodes/Hashtag.js'
 import Mention from './nodes/Mention.js'
 import { mapGetters } from 'vuex'
 import MenuBar from './MenuBar'
-import SuggestionsMenu from './SuggestionsMenu'
 import ContextMenu from './ContextMenu'
+import SuggestionsMenu from './SuggestionsMenu'
+import LinkInput from './LinkInput'
 
 let throttleInputEvent
 
 export default {
   components: {
+    ContextMenu,
     EditorContent,
-    EditorMenuBubble,
+    LinkInput,
     MenuBar,
     SuggestionsMenu,
-    ContextMenu,
   },
   props: {
     users: { type: Array, default: () => null }, // If 'null', than the Mention extention is not assigned.
@@ -373,26 +340,24 @@ export default {
         this.$emit('input', content)
       }
     },
-    showLinkMenu(attrs) {
+    showLinkMenu(attrs, element) {
       this.linkUrl = attrs.href
       this.linkMenuIsActive = true
+      this.$refs.contextMenu.displayContextMenu(element, this.$refs.linkMenu.$el, 'click')
       this.$nextTick(() => {
         try {
-          const $el = this.$refs.linkInput.$el.getElementsByTagName('input')[0]
-          $el.focus()
-          $el.select()
+          const input = this.$refs.linkMenu.$el.querySelector('input')
+          input.focus()
+          input.select()
         } catch (err) {}
       })
     },
     hideLinkMenu() {
+      this.$refs.contextMenu.hideContextMenu()
       this.linkUrl = null
       this.linkMenuIsActive = false
       this.editor.focus()
     },
-    hideMenu(isActive) {
-      isActive = false
-      this.hideLinkMenu()
-    },
     setLinkUrl(command, url) {
       const links = linkify().match(url)
       if (links) {
@@ -469,12 +434,6 @@ export default {
   }
 }
 
-.ProseMirror {
-  padding: $space-base;
-  margin: -$space-base;
-  min-height: $space-large;
-}
-
 .ProseMirror:focus {
   outline: none;
 }
diff --git a/webapp/components/Editor/LinkInput.vue b/webapp/components/Editor/LinkInput.vue
new file mode 100644
index 000000000..d870065ef
--- /dev/null
+++ b/webapp/components/Editor/LinkInput.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <ds-input
+      v-model="linkUrl"
+      class="editor-menu-link-input"
+      placeholder="https://"
+      @blur.native.capture="hideLinkMenu()"
+      @keydown.native.esc.prevent="hideLinkMenu()"
+      @keydown.native.enter.prevent="setLinkUrl(editorCommand, linkUrl)"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['hideLinkMenu', 'setLinkUrl', 'editorCommand'],
+  data() {
+    return {
+      linkUrl: null,
+    }
+  },
+}
+</script>
diff --git a/webapp/components/Editor/MenuBar.vue b/webapp/components/Editor/MenuBar.vue
index d4ff1a673..38f278978 100644
--- a/webapp/components/Editor/MenuBar.vue
+++ b/webapp/components/Editor/MenuBar.vue
@@ -6,8 +6,9 @@
       <menu-bar-button :isActive="isActive.italic()" :onClick="commands.italic" icon="italic" />
 
       <menu-bar-button
+        ref="linkButton"
         :isActive="isActive.link()"
-        :onClick="() => showLinkMenu(getMarkAttrs('link'))"
+        :onClick="event => showLinkMenu(getMarkAttrs('link'), event.currentTarget)"
         icon="link"
       />