core/modules/toolbar/css/toolbar.module.css        | 4 ++++
 core/modules/toolbar/js/views/ToolbarVisualView.js | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css
index 771b705..c07df14 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -236,6 +236,10 @@ body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
 .toolbar-oriented .toolbar-tray .toolbar-toggle-orientation {
   display: block;
 }
+/* Necessary to override the preceding selector when setting .hidden. */
+.toolbar-oriented .toolbar-tray .toolbar-toggle-orientation.hidden {
+  display: none;
+}
 .toolbar-oriented .toolbar-tray-horizontal .toolbar-toggle-orientation {
   bottom: 0;
   position: absolute;
diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index 456e602..2645f52 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -213,7 +213,8 @@
       var iconClass = 'toolbar-icon-toggle-' + orientation;
       var iconAntiClass = 'toolbar-icon-toggle-' + antiOrientation;
       var $orientationToggle = this.$el.find('.toolbar-toggle-orientation')
-        .toggle(this.model.get('isTrayToggleVisible'));
+        // toggleClass('hidden') is an order of magnitude faster than .toggle().
+        .toggleClass('hidden', !this.model.get('isTrayToggleVisible'));
       $orientationToggle.find('button')
         .val(antiOrientation)
         .attr('title', this.strings[antiOrientation])