diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index c0bf3da43..72b95771d 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -43,7 +43,42 @@
         </div>
       </div>
     </div>
-    <hc-menu-bar :editor="editor" />
+    <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>
+              <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" />
   </div>
 </template>
@@ -54,20 +89,21 @@ import linkify from 'linkify-it'
 import stringHash from 'string-hash'
 import Fuse from 'fuse.js'
 import tippy from 'tippy.js'
-import { Editor, EditorContent } from 'tiptap'
+import { Editor, EditorContent, EditorMenuBubble } 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 HcMenuBar from './MenuBar'
+import MenuBar from './MenuBar'
 
 let throttleInputEvent
 
 export default {
   components: {
     EditorContent,
-    HcMenuBar,
+    EditorMenuBubble,
+    MenuBar,
   },
   props: {
     users: { type: Array, default: () => null }, // If 'null', than the Mention extention is not assigned.
diff --git a/webapp/components/Editor/MenuBar.vue b/webapp/components/Editor/MenuBar.vue
index 8156eee9e..d4ff1a673 100644
--- a/webapp/components/Editor/MenuBar.vue
+++ b/webapp/components/Editor/MenuBar.vue
@@ -1,65 +1,57 @@
 <template>
   <editor-menu-bar :editor="editor" v-slot="{ commands, isActive, getMarkAttrs }">
     <div>
-      <menu-bar-button
-        :isActive="isActive.bold()"
-        :onClick="commands.bold"
-        icon="bold"
-      ></menu-bar-button>
+      <menu-bar-button :isActive="isActive.bold()" :onClick="commands.bold" icon="bold" />
+
+      <menu-bar-button :isActive="isActive.italic()" :onClick="commands.italic" icon="italic" />
 
       <menu-bar-button
-        :isActive="isActive.italic()"
-        :onClick="commands.italic"
-        icon="italic"
-      ></menu-bar-button>
-
-      <!-- <menu-bar-button
         :isActive="isActive.link()"
         :onClick="() => showLinkMenu(getMarkAttrs('link'))"
         icon="link"
-      ></menu-bar-button>-->
+      />
 
       <menu-bar-button
         :isActive="isActive.paragraph()"
         :onClick="commands.paragraph"
         icon="paragraph"
-      ></menu-bar-button>
+      />
 
       <menu-bar-button
         :isActive="isActive.heading({ level: 3 })"
         :onClick="() => commands.heading({ level: 3 })"
         label="H3"
-      ></menu-bar-button>
+      />
 
       <menu-bar-button
         :isActive="isActive.heading({ level: 4 })"
         :onClick="() => commands.heading({ level: 4 })"
         label="H4"
-      ></menu-bar-button>
+      />
 
       <menu-bar-button
         :isActive="isActive.bullet_list()"
         :onClick="commands.bullet_list"
         icon="list-ul"
-      ></menu-bar-button>
+      />
 
       <menu-bar-button
         :isActive="isActive.ordered_list()"
         :onClick="commands.ordered_list"
         icon="list-ol"
-      ></menu-bar-button>
+      />
 
       <menu-bar-button
         :isActive="isActive.blockquote()"
         :onClick="commands.blockquote"
         icon="quote-right"
-      ></menu-bar-button>
+      />
 
       <menu-bar-button
         :isActive="isActive.horizontal_rule()"
         :onClick="commands.horizontal_rule"
         icon="minus"
-      ></menu-bar-button>
+      />
     </div>
   </editor-menu-bar>
 </template>
@@ -73,6 +65,9 @@ export default {
     EditorMenuBar,
     MenuBarButton,
   },
-  props: ['editor'],
+  props: {
+    editor: Object,
+    showLinkMenu: Function,
+  },
 }
 </script>