diff --git a/mycodo/mycodo_flask/templates/layout.html b/mycodo/mycodo_flask/templates/layout.html
index 1f991c84a..afa77d0f6 100644
--- a/mycodo/mycodo_flask/templates/layout.html
+++ b/mycodo/mycodo_flask/templates/layout.html
@@ -197,14 +197,14 @@
               <div class="dropdown-divider"></div>
               <a class="dropdown-item disabled" href="#"><i class="fas fa-tachometer-alt"></i> {{_('Dashboards')}}</a>
               {% for each_dash in dashboards %}
-              <a class="dropdown-item" href="/dashboard/{{each_dash.unique_id}}">{{each_dash.name}}</a>
+              <a class="dropdown-item{% if each_dash.unique_id == dashboard_id %} active{% endif %}" href="/dashboard/{{each_dash.unique_id}}">{{each_dash.name}}</a>
               <div class="dropdown-divider"></div>
               {% endfor %}
               <a class="dropdown-item" href="/dashboard-add">{{_('Add Dashboard')}}</a>
             </div>
           </li>
 
-          <li class="nav-item dropdown{% if active_page in ['data', 'output', 'function', 'method_list'] %} active{% endif %}">
+          <li class="nav-item dropdown{% if active_page in ['input', 'output', 'function', 'method_list'] %} active{% endif %}">
             <a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{_('Setup')}}</a>
             <div class="dropdown-menu" aria-labelledby="dropdown01">
               <a class="dropdown-item{% if active_page == 'input' %} active{% endif %}" href="{{url_for('routes_input.page_input')}}"><i class="fas fa-database"></i> {{dict_translation['input']['title']}}</a>
diff --git a/mycodo/mycodo_flask/templates/pages/input.html b/mycodo/mycodo_flask/templates/pages/input.html
index 4fc69143e..246ba81a5 100644
--- a/mycodo/mycodo_flask/templates/pages/input.html
+++ b/mycodo/mycodo_flask/templates/pages/input.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% set active_page = "data" %}
+{% set active_page = "input" %}
 {% set help_page = ["https://kizniche.github.io/Mycodo/Inputs/", dict_translation['input']['title']] %}
 
 {% block title %} - {{dict_translation['input']['title']}}{% endblock %}