diff --git a/geordash/templates/dashboard/header.tmpl b/geordash/templates/dashboard/header.tmpl
index 4c21d42..3095bf7 100644
--- a/geordash/templates/dashboard/header.tmpl
+++ b/geordash/templates/dashboard/header.tmpl
@@ -37,7 +37,7 @@
 {% endblock scripts %}
 
 {% macro render_dropdown_item(endpoint, text, _badge='', _badge_classes='badge text-bg-light') %}
-    {% set active = True if request.endpoint and request.endpoint == endpoint else False %}
+    {% set active = True if request.full_path and request.full_path == url_for(endpoint, **kwargs)+"?" else False %}
     <li>
     <a class="dropdown-item{% if active %} active" aria-current="page{% endif %}"
        href="{{ url_for(endpoint, **kwargs) }}">