diff --git a/openstack_dashboard/templates/context_selection/_project_list.html b/openstack_dashboard/templates/context_selection/_project_list.html
index 25c2eab199..2ce2e1c809 100644
--- a/openstack_dashboard/templates/context_selection/_project_list.html
+++ b/openstack_dashboard/templates/context_selection/_project_list.html
@@ -1,12 +1,12 @@
 {% load i18n %}
 
-{% with dashboard_url=request.horizon.dashboard.get_absolute_url %}
+{% with page_url=request.horizon.panel.get_absolute_url %}
 <ul class="dropdown-menu">
   <li class="dropdown-header">{% trans "Projects:" %}</li>
   {% for project in projects %}
   <li>
     <a class="{% if project.enabled and project.id == project_id %} dropdown-selected{% endif %}"
-       href="{% url 'switch_tenants' project.id %}?next={{ dashboard_url }}"
+       href="{% url 'switch_tenants' project.id %}?next={{ page_url }}"
        target="_self">
       <span class="fa fa-check dropdown-selected-icon"></span>
       <span class="dropdown-title">