diff --git a/editor/src/wikilinks2.js b/editor/src/wikilinks2.js
index 5e455d1..011bf3b 100644
--- a/editor/src/wikilinks2.js
+++ b/editor/src/wikilinks2.js
@@ -69,7 +69,7 @@ Plugin.prototype.render = function (tokens, id, options, env) {
             return '<input type="checkbox" class="checkbox" checked>';
         }
     }
-    return '<a href="'+this.options.relativeBaseURL+encodeURIComponent(link.replace(' ', '_')) + '" class="wiki-link">' + (tag ? '#' : '') + link + '</a>';
+    return '<a href="'+this.options.relativeBaseURL+encodeURIComponent(link.replace(/ +/g, '_')) + '" class="wiki-link">' + (tag ? '#' : '') + link + '</a>';
 }
 
 export default (options) => {
diff --git a/editor/test/markdown.test.js b/editor/test/markdown.test.js
index 3bce29a..1adf48c 100644
--- a/editor/test/markdown.test.js
+++ b/editor/test/markdown.test.js
@@ -65,6 +65,6 @@ describe('MD', function () {
     })
 
     it('parseLinks double url', function () {
-        assert.deepStrictEqual(MD.renderInline("[[test [[link]] test2]]"), '<a href="/edit/test_%5B%5Blink%5D%5D%20test2" class="wiki-link">test [[link]] test2</a>')
+        assert.deepStrictEqual(MD.renderInline("[[test [[link]] test2]]"), '<a href="/edit/test_%5B%5Blink%5D%5D_test2" class="wiki-link">test [[link]] test2</a>')
     })
 })