diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index ea3ee0cbe5e120cf29287989eb04b4453bdd1bac..d687ebbeb4a2bd90840222a3100c880a903c0971 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -11,6 +11,7 @@ var linkwiz = {
     sack:   null,
     textArea: null,
     selected: -1,
+    selection: null,
 
     /**
      * Initialize the linkwizard by creating the needed HTML
@@ -194,7 +195,10 @@ var linkwiz = {
      */
     insertLink: function(title){
         if(!linkwiz.entry.value) return;
-        var sel  = getSelection(linkwiz.textArea);
+
+        var sel = getSelection(linkwiz.textArea);
+        if(sel.start == 0 && sel.end == 0) sel = linkwiz.selection;
+
         var stxt = sel.getText();
         if(!stxt && !DOKU_UHC) stxt=title;
 
@@ -250,6 +254,7 @@ var linkwiz = {
      * Show the linkwizard
      */
     show: function(){
+        linkwiz.selection  = getSelection(linkwiz.textArea);
         linkwiz.wiz.style.marginLeft = '0px';
         linkwiz.entry.focus();
         linkwiz.autocomplete();