diff --git a/ayanova/src/api/translation.js b/ayanova/src/api/translation.js
index 92431019..26cd4bee 100644
--- a/ayanova/src/api/translation.js
+++ b/ayanova/src/api/translation.js
@@ -160,7 +160,10 @@ export default {
     "DataListView",
     "FilterUnsaved",
     "Heading",
-    "Table"
+    "Table",
+    "InsertLink",
+    "LinkUrl",
+    "LinkText"
   ],
 
   ////////////////////////////////////////////////////////
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index 809c37a4..945eb757 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -149,18 +149,30 @@
                 </v-card-actions>
               </v-card>
             </v-menu>
-
-            <v-menu v-model="linkMenu" :close-on-content-click="false" offset-y>
-              <template v-slot:activator="{ on }">
-                <v-btn depressed tile v-on="on">
-                  <v-icon>fa-link</v-icon>
-                </v-btn>
-              </template>
+            <v-btn depressed tile @click="openLinkMenu">
+              <v-icon>fa-link</v-icon>
+            </v-btn>
+            <v-menu
+              min-width="300"
+              v-model="linkMenu"
+              :close-on-content-click="false"
+              offset-y
+              :position-x="linkMenuX"
+              :position-y="linkMenuY"
+              absolute
+            >
               <v-card width="300">
                 <v-card-title>{{ $ay.t("InsertLink") }}</v-card-title>
 
                 <div class="ma-8">
-                  linkUrl linkText
+                  <v-text-field
+                    v-model="linkUrl"
+                    :label="$ay.t('LinkUrl')"
+                  ></v-text-field>
+                  <v-text-field
+                    v-model="linkText"
+                    :label="$ay.t('LinkText')"
+                  ></v-text-field>
                 </div>
 
                 <v-card-actions>
@@ -249,6 +261,8 @@ export default {
       tableMenuColumns: 2,
       tableMenuRows: 2,
       linkMenu: false,
+      linkMenuX: 10,
+      linkMenuY: 10,
       linkUrl: "",
       linkText: ""
     };
@@ -598,7 +612,17 @@ export default {
 
       this.replaceSelectedText(t);
     },
-
+    openLinkMenu(e) {
+      e.preventDefault();
+      this.linkMenu = false;
+      this.getSelectedRange();
+      this.linkText = this.getSelectedText();
+      this.linkMenuX = e.clientX;
+      this.linkMenuY = e.clientY;
+      this.$nextTick(() => {
+        this.linkMenu = true;
+      });
+    },
     clickLink() {
       this.linkMenu = false;