diff --git a/horizon/static/horizon/js/horizon.tabs.js b/horizon/static/horizon/js/horizon.tabs.js
index 9b6df76400..823620bba3 100644
--- a/horizon/static/horizon/js/horizon.tabs.js
+++ b/horizon/static/horizon/js/horizon.tabs.js
@@ -24,6 +24,11 @@ horizon.tabs.load_tab = function (evt) {
 horizon.addInitFunction(function () {
   var data = horizon.cookies.read('tabs');
 
+  $(".tab-content").find(".js-tab-pane").addClass("tab-pane");
+  horizon.modals.addModalInitFunction(function (el) {
+    $(el).find(".js-tab-pane").addClass("tab-pane");
+  });
+
   $(document).on("show", ".ajax-tabs a[data-loaded='false']", horizon.tabs.load_tab);
 
   $(document).on("shown", ".nav-tabs a[data-toggle='tab']", function (evt) {
diff --git a/horizon/templates/horizon/common/_workflow.html b/horizon/templates/horizon/common/_workflow.html
index 2b89981fda..d8aa4cbade 100644
--- a/horizon/templates/horizon/common/_workflow.html
+++ b/horizon/templates/horizon/common/_workflow.html
@@ -12,15 +12,18 @@
       <ul class="nav nav-tabs">
         {% for step in workflow.steps %}
         <li class="{% if entry_point == step.slug %}active{% endif %}{% if step.has_errors %} error{% endif %}">
-          <a data-toggle="tab" data-target="#{{ step.get_id }}">{{ step }}</a>
+          <a href="#{{ step.get_id }}" data-toggle="tab" data-target="#{{ step.get_id }}">{{ step }}</a>
         </li>
         {% endfor %}
       </ul>
       <div class="tab-content">
         {% for step in workflow.steps %}
-        <fieldset id="{{ step.get_id }}" class="tab-pane{% if entry_point == step.slug %} active{% endif %}">
-          {{ step.render }}
-        </fieldset>
+          <fieldset id="{{ step.get_id }}" class="js-tab-pane{% if entry_point == step.slug %} active{% endif %}">
+            {{ step.render }}
+          </fieldset>
+          {% if not forloop.last %}
+            <noscript><hr /></noscript>
+          {% endif %}
         {% endfor %}
       </div>
     {% endblock %}
diff --git a/openstack_dashboard/static/dashboard/less/horizon.less b/openstack_dashboard/static/dashboard/less/horizon.less
index 9abdbf2705..0bfe7d793a 100644
--- a/openstack_dashboard/static/dashboard/less/horizon.less
+++ b/openstack_dashboard/static/dashboard/less/horizon.less
@@ -1539,6 +1539,6 @@ label.log-length {
     margin-bottom: 9px;
 }
 .modal-body fieldset .form-field select[data-add-item-url] {
-    width: 276px;
+    width: 275px;
     margin-right: 2px;
 }