diff --git a/app/assets/javascripts/discourse/helpers/link-domain.js.es6 b/app/assets/javascripts/discourse/helpers/link-domain.js.es6
index b16255d94..ba59b7f50 100644
--- a/app/assets/javascripts/discourse/helpers/link-domain.js.es6
+++ b/app/assets/javascripts/discourse/helpers/link-domain.js.es6
@@ -1,5 +1,6 @@
-Handlebars.registerHelper('link-domain', function(property, options) {
-  var link = Em.get(this, property, options);
+import registerUnbound from 'discourse/helpers/register-unbound';
+
+registerUnbound('link-domain', function(link) {
   if (link) {
     var internal = Em.get(link, 'internal'),
         hasTitle = (!Em.isEmpty(Em.get(link, 'title')));
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
index 733267eb0..18eeb0ffe 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
@@ -82,7 +82,7 @@
 
         {{#if showAllLinksControls}}
           <div class='link-summary'>
-            <a href='#' {{action "showAllLinks"}}>{{i18n 'topic_map.links_shown' totalLinks=details.links.length}}</a>
+            <a href {{action "showAllLinks"}}>{{i18n 'topic_map.links_shown' totalLinks=details.links.length}}</a>
           </div>
         {{/if}}