diff --git a/src/octoprint/templates/dialogs/settings.jinja2 b/src/octoprint/templates/dialogs/settings.jinja2
index 2896745f..7a512a5d 100644
--- a/src/octoprint/templates/dialogs/settings.jinja2
+++ b/src/octoprint/templates/dialogs/settings.jinja2
@@ -6,6 +6,7 @@
     <div class="modal-body">
         <div class="tabbable">
             <ul class="nav nav-list span4" id="settingsTabs">
+                {% set mark_active = True %}
                 {% for key in templates.settings.order %}
                     {% set entry, data = templates.settings.entries[key] %}
                     {% if data is none %}
@@ -14,7 +15,7 @@
                         {% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
                         <li id="{{ data._div }}_link"
                             {% if "data_bind" in data %}data-bind="{{ data.data_bind }}"{% endif %}
-                            class="{% if loop.first and first_heading %}active{% endif %} {% if "classes_link" in data %}{{ data.classes_link|join(' ') }}{% elif "classes" in data %}{{ data.classes|join(' ') }}{% endif %}"
+                            class="{% if mark_active %}active{% set mark_active = False %}{% endif %} {% if "classes_link" in data %}{{ data.classes_link|join(' ') }}{% elif "classes" in data %}{{ data.classes|join(' ') }}{% endif %}"
                             {% if "styles_link" in data %} style="{{ data.styles_link|join(', ') }}" {% elif "styles" in data %} style="{{ data.styles|join(', ') }}" {% endif %}
                                 >
                             <a href="#{{ data._div }}" data-toggle="tab">{{ entry }}</a>
@@ -25,13 +26,14 @@
             </ul>
 
             <div class="tab-content span8">
+                {% set mark_active = True %}
                 {% for key in templates.settings.order %}
                     {% set entry, data = templates.settings.entries[key] %}
                     {% if data is not none %}
                         {% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
                         <div id="{{ data._div }}"
                              {% if "data_bind" in data %}data-bind="{{ data.data_bind }}"{% endif %}
-                             class="tab-pane {% if loop.first and first_heading %}active{% endif %} {% if classes_content in data %}{{ data.classes_content|join(' ') }}{% elif classes in data %}{{ data.classes|join(' ') }}{% endif %}"
+                             class="tab-pane {% if mark_active %}active{% set mark_active = False %}{% endif %} {% if classes_content in data %}{{ data.classes_content|join(' ') }}{% elif classes in data %}{{ data.classes|join(' ') }}{% endif %}"
                              {% if "styles_content" in data %} style="{{ data.styles_content|join(', ') }}" {% elif styles in data %} style="{{ data.styles|join(', ') }}" {% endif %}
                                 >
                             {% include data.template ignore missing %}