diff --git a/core/misc/vertical-tabs.js b/core/misc/vertical-tabs.js
index ea89e85030..f06683f312 100644
--- a/core/misc/vertical-tabs.js
+++ b/core/misc/vertical-tabs.js
@@ -43,7 +43,7 @@
             details: $that
           });
           tab_list.append(vertical_tab.item);
-          $that.removeClass('collapsed').attr('open', true).addClass('vertical-tabs__pane').data('verticalTab', vertical_tab);
+          $that.removeClass('collapsed').addClass('vertical-tabs__pane').data('verticalTab', vertical_tab);
           if (this.id === focusID) {
             tab_focus = $that;
           }
@@ -60,6 +60,15 @@
             tab_focus = $this.find('> .vertical-tabs__pane').eq(0);
           }
         }
+
+        var $tab = $('[open]', $this);
+        if ($tab.length) {
+          var tabData = $tab.first().data('verticalTab');
+
+          if (tabData) {
+            tab_focus = $tab.first();
+          }
+        }
         if (tab_focus.length) {
           tab_focus.data('verticalTab').focus();
         }
@@ -96,9 +105,12 @@
     focus: function focus() {
       this.details.siblings('.vertical-tabs__pane').each(function () {
         var tab = $(this).data('verticalTab');
+        tab.details.attr('open', false);
         tab.details.hide();
         tab.item.removeClass('is-selected');
       }).end().show().siblings(':hidden.vertical-tabs__active-tab').val(this.details.attr('id'));
+
+      this.details.attr('open', true);
       this.item.addClass('is-selected');
 
       $('#active-vertical-tab').remove();