diff --git a/gui/app/components/search/search-results.js b/gui/app/components/search/search-results.js
index 53a9103c..0ae08610 100644
--- a/gui/app/components/search/search-results.js
+++ b/gui/app/components/search/search-results.js
@@ -9,10 +9,14 @@
 //
 // https://documize.com
 
+import { computed } from '@ember/object';
 import Component from '@ember/component';
 
 export default Component.extend({
 	resultPhrase: '',
+	searchQuery: computed('keywords', function() {
+		return encodeURIComponent(this.get('keywords'));
+	}),
 
 	didReceiveAttrs() {
 		this._super(...arguments);
diff --git a/gui/app/templates/components/search/search-results.hbs b/gui/app/templates/components/search/search-results.hbs
index 7d9c7cdc..94f4e9b8 100644
--- a/gui/app/templates/components/search/search-results.hbs
+++ b/gui/app/templates/components/search/search-results.hbs
@@ -3,7 +3,7 @@
 	<ul class="documents">
 		{{#each documents key="id" as |result index|}}
 			<li class="document">
-				<a class="link" href="s/{{result.spaceId}}/{{result.spaceSlug}}/d/{{ result.documentId }}/{{result.documentSlug}}?currentPageId={{result.itemId}}">
+				{{#link-to 'document.index' result.spaceId result.spaceSlug result.documentId result.documentSlug (query-params currentPageId=result.itemId source=searchQuery) class="link"}}
 					<div class="title">
 						{{result.document}}
 						{{#if (gt result.versionId.length 0)}}
@@ -16,7 +16,7 @@
 					{{#if result.template}}
 						<button type="button" class="mt-3 btn btn-warning text-uppercase font-weight-bold">TEMPLATE</button>
 					{{/if}}
-				</a>
+				{{/link-to}}
 			</li>
 		{{/each}}
 	</ul>