diff --git a/core/frontend/helpers/tpl/navigation.hbs b/core/frontend/helpers/tpl/navigation.hbs
index 88d91f8bbc..0be5f13953 100644
--- a/core/frontend/helpers/tpl/navigation.hbs
+++ b/core/frontend/helpers/tpl/navigation.hbs
@@ -1,5 +1,5 @@
 <ul class="nav" role="menu">
     {{#foreach navigation}}
-    <li class="nav-{{slug}}{{#if current}} nav-current{{/if}}" role="menuitem"><a href="{{url absolute="true"}}">{{label}}</a></li>
+    <li class="{{link_class for=(url) class=(concat "nav-" slug)}}" role="menuitem"><a href="{{url absolute="true"}}">{{label}}</a></li>
     {{/foreach}}
 </ul>
diff --git a/core/test/unit/helpers/navigation_spec.js b/core/test/unit/helpers/navigation_spec.js
index 4e59b1038a..9f3855076e 100644
--- a/core/test/unit/helpers/navigation_spec.js
+++ b/core/test/unit/helpers/navigation_spec.js
@@ -21,6 +21,8 @@ describe('{{navigation}} helper', function () {
 
         // The navigation partial expects this helper
         // @TODO: change to register with Ghost's own registration tools
+        hbs.registerHelper('link_class', helpers.link_class);
+        hbs.registerHelper('concat', helpers.concat);
         hbs.registerHelper('url', helpers.url);
         hbs.registerHelper('foreach', helpers.foreach);
     });