diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 3379c058c..41a88ef44 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -16,7 +16,7 @@
         <div id="navbar" class="navbar-collapse collapse">
             {% if request.user.is_authenticated or not settings.LOGIN_REQUIRED %}
             <ul class="nav navbar-nav">
-                <li class="dropdown{% if request.path|contains:'/dcim/sites/,/dcim/regions/,/tenancy/,/extras/tags/,/extras/reports/' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Organization <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Sites</li>
@@ -39,47 +39,6 @@
                             <a href="{% url 'dcim:region_list' %}">Regions</a>
                         </li>
                         <li class="divider"></li>
-                        <li class="dropdown-header">Tenancy</li>
-                        <li{% if not perms.tenancy.view_tenant %} class="disabled"{% endif %}>
-                            {% if perms.tenancy.add_tenant %}
-                                <div class="buttons pull-right">
-                                    <a href="{% url 'tenancy:tenant_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
-                                    <a href="{% url 'tenancy:tenant_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
-                                </div>
-                            {% endif %}
-                            <a href="{% url 'tenancy:tenant_list' %}">Tenants</a>
-                        </li>
-                        <li{% if not perms.tenancy.view_tenantgroup %} class="disabled"{% endif %}>
-                            {% if perms.tenancy.add_tenantgroup %}
-                                <div class="buttons pull-right">
-                                    <a href="{% url 'tenancy:tenantgroup_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
-                                    <a href="{% url 'tenancy:tenantgroup_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
-                                </div>
-                            {% endif %}
-                            <a href="{% url 'tenancy:tenantgroup_list' %}">Tenant Groups</a>
-                        </li>
-                        <li class="divider"></li>
-                        <li class="dropdown-header">Miscellaneous</li>
-                        <li{% if not perms.extras.view_tag %} class="disabled"{% endif %}>
-                            <a href="{% url 'extras:tag_list' %}">Tags</a>
-                        </li>
-                        <li{% if not perms.extras.view_configcontext %} class="disabled"{% endif %}>
-                            <a href="{% url 'extras:configcontext_list' %}">Config Contexts</a>
-                        </li>
-                        <li{% if not perms.extras.view_script %} class="disabled"{% endif %}>
-                            <a href="{% url 'extras:script_list' %}">Scripts</a>
-                        </li>
-                        <li{% if not perms.extras.view_reportresult %} class="disabled"{% endif %}>
-                            <a href="{% url 'extras:report_list' %}">Reports</a>
-                        </li>
-                        <li{% if not perms.extras.view_objectchange %} class="disabled"{% endif %}>
-                            <a href="{% url 'extras:objectchange_list' %}">Changelog</a>
-                        </li>
-                    </ul>
-                </li>
-                <li class="dropdown{% if request.path|contains:'/dcim/rack' %} active{% endif %}">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Racks <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
                         <li class="dropdown-header">Racks</li>
                         <li{% if not perms.dcim.view_rack %} class="disabled"{% endif %}>
                             {% if perms.dcim.add_rack %}
@@ -114,9 +73,34 @@
                         <li{% if not perms.dcim.view_rackreservation %} class="disabled"{% endif %}>
                             <a href="{% url 'dcim:rackreservation_list' %}">Reservations</a>
                         </li>
+                        <li class="divider"></li>
+                        <li class="dropdown-header">Tenancy</li>
+                        <li{% if not perms.tenancy.view_tenant %} class="disabled"{% endif %}>
+                            {% if perms.tenancy.add_tenant %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'tenancy:tenant_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
+                                    <a href="{% url 'tenancy:tenant_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
+                            <a href="{% url 'tenancy:tenant_list' %}">Tenants</a>
+                        </li>
+                        <li{% if not perms.tenancy.view_tenantgroup %} class="disabled"{% endif %}>
+                            {% if perms.tenancy.add_tenantgroup %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'tenancy:tenantgroup_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
+                                    <a href="{% url 'tenancy:tenantgroup_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
+                            <a href="{% url 'tenancy:tenantgroup_list' %}">Tenant Groups</a>
+                        </li>
+                        <li class="divider"></li>
+                        <li class="dropdown-header">Tags</li>
+                        <li{% if not perms.extras.view_tag %} class="disabled"{% endif %}>
+                            <a href="{% url 'extras:tag_list' %}">Tags</a>
+                        </li>
                     </ul>
                 </li>
-                <li class="dropdown{% if request.path|contains:'/dcim/device,/dcim/virtual-chassis,/dcim/manufacturers/,/dcim/platforms/,/dcim/cable,-connections/,/dcim/inventory-items/' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Devices <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Devices</li>
@@ -201,7 +185,7 @@
                         </li>
                     </ul>
                 </li>
-                <li class="dropdown{% if request.path|contains:'/ipam/' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">IPAM <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">IP Addresses</li>
@@ -292,7 +276,7 @@
                         </li>
                     </ul>
                 </li>
-                <li class="dropdown{% if request.path|contains:'/virtualization/' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Virtualization <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Virtual Machines</li>
@@ -336,7 +320,7 @@
                         </li>
                     </ul>
                 </li>
-                <li class="dropdown{% if request.path|contains:'/circuits/' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Circuits <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Circuits</li>
@@ -371,7 +355,7 @@
                         </li>
                     </ul>
                 </li>
-                <li class="dropdown{% if request.path|contains:'/dcim/power' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Power <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Power</li>
@@ -395,7 +379,7 @@
                         </li>
                     </ul>
                 </li>
-                <li class="dropdown{% if request.path|contains:'/secrets/' %} active{% endif %}">
+                <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Secrets <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Secrets</li>
@@ -418,6 +402,26 @@
                         </li>
                     </ul>
                 </li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Other <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li class="dropdown-header">Logging</li>
+                        <li{% if not perms.extras.view_objectchange %} class="disabled"{% endif %}>
+                            <a href="{% url 'extras:objectchange_list' %}">Changelog</a>
+                        </li>
+                        <li class="divider"></li>
+                        <li class="dropdown-header">Miscellaneous</li>
+                        <li{% if not perms.extras.view_configcontext %} class="disabled"{% endif %}>
+                            <a href="{% url 'extras:configcontext_list' %}">Config Contexts</a>
+                        </li>
+                        <li{% if not perms.extras.view_script %} class="disabled"{% endif %}>
+                            <a href="{% url 'extras:script_list' %}">Scripts</a>
+                        </li>
+                        <li{% if not perms.extras.view_reportresult %} class="disabled"{% endif %}>
+                            <a href="{% url 'extras:report_list' %}">Reports</a>
+                        </li>
+                    </ul>
+                </li>
             </ul>
             {% endif %}
             <ul class="nav navbar-nav navbar-right">