diff --git i/core/modules/toolbar/js/views/ToolbarVisualView.es6.js w/core/modules/toolbar/js/views/ToolbarVisualView.es6.js
index 87c8fc5b3f..860e9749ab 100644
--- i/core/modules/toolbar/js/views/ToolbarVisualView.es6.js
+++ w/core/modules/toolbar/js/views/ToolbarVisualView.es6.js
@@ -76,7 +76,7 @@
        */
       updateToolbarHeight() {
         const toolbarTabOuterHeight =
-          $('#toolbar-bar').find('.toolbar-tab').outerHeight() || 0;
+        $('#toolbar-bar .toolbar-tab:visible').parent().outerHeight() || 0;
         const toolbarTrayHorizontalOuterHeight =
           $('.is-active.toolbar-tray-horizontal').outerHeight() || 0;
         this.model.set(
@@ -85,7 +85,9 @@
         );
 
         $('body').css({
-          'padding-top': this.model.get('height'),
+          'padding-top': this.model.attributes.isOriented
+            ? this.model.get('height')
+            : 0,
         });
         $('html').css({
           'scroll-padding-top': this.model.get('height'),
@@ -321,6 +323,7 @@
             .removeClass('toolbar-tray-horizontal')
             .addClass('toolbar-tray-vertical');
         }
+        this.updateToolbarHeight();
       },
 
       /**
diff --git i/core/modules/toolbar/js/views/ToolbarVisualView.js w/core/modules/toolbar/js/views/ToolbarVisualView.js
index c9f109dcb6..1c725b4d90 100644
--- i/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ w/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -30,11 +30,11 @@
       this.model.trigger('change:activeTab');
     },
     updateToolbarHeight: function updateToolbarHeight() {
-      var toolbarTabOuterHeight = $('#toolbar-bar').find('.toolbar-tab').outerHeight() || 0;
+      var toolbarTabOuterHeight = $('#toolbar-bar .toolbar-tab:visible').parent().outerHeight() || 0;
       var toolbarTrayHorizontalOuterHeight = $('.is-active.toolbar-tray-horizontal').outerHeight() || 0;
       this.model.set('height', toolbarTabOuterHeight + toolbarTrayHorizontalOuterHeight);
       $('body').css({
-        'padding-top': this.model.get('height')
+        'padding-top': this.model.attributes.isOriented ? this.model.get('height') : 0
       });
       $('html').css({
         'scroll-padding-top': this.model.get('height')
@@ -151,6 +151,7 @@
       if (!this.model.get('isOriented')) {
         $trays.removeClass('toolbar-tray-horizontal').addClass('toolbar-tray-vertical');
       }
+      this.updateToolbarHeight();
     },
     loadSubtrees: function loadSubtrees() {
       var $activeTab = $(this.model.get('activeTab'));