diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index dc3483426..1632d9766 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -8,10 +8,10 @@ module ApplicationHelper
   end
 
   def nav_link_to(text, url, **options)
+    klass = options.delete(:class)
+
     if nav_link_match(params[:controller], url)
-      klass = "current"
-    else
-      klass = nil
+      klass = "#{klass} current"
     end
 
     li_link_to(text, url, id_prefix: "nav-", class: klass, **options)