diff --git a/core/misc/tableheader.es6.js b/core/misc/tableheader.es6.js
index 9d3bceecbcac8e03c730387a17f61ee4e3847e64..8b39676651165162fa5e0bea878ce8d26312c4ae 100644
--- a/core/misc/tableheader.es6.js
+++ b/core/misc/tableheader.es6.js
@@ -139,12 +139,12 @@
   // Bind to custom Drupal events.
   $(document).on({
     /**
-     * Recalculate columns width when window is resized and when show/hide
-     * weight is triggered.
+     * Recalculate columns width when window is resized, when show/hide weight
+     * is triggered, or when toolbar tray is toggled.
      *
      * @ignore
      */
-    'columnschange.TableHeader': tableHeaderResizeHandler,
+    'columnschange.TableHeader drupalToolbarTrayChange': tableHeaderResizeHandler,
 
     /**
      * Recalculate TableHeader.topOffset when viewport is resized.
diff --git a/core/misc/tableheader.js b/core/misc/tableheader.js
index f01301907be1bbeb2b821feef7632efb91143e1f..061b708dae42c13e8ad81df44c845c4c4b763b7f 100644
--- a/core/misc/tableheader.js
+++ b/core/misc/tableheader.js
@@ -78,7 +78,7 @@
     'scroll.TableHeader': tableHeaderOnScrollHandler
   });
   $(document).on({
-    'columnschange.TableHeader': tableHeaderResizeHandler,
+    'columnschange.TableHeader drupalToolbarTrayChange': tableHeaderResizeHandler,
     'drupalViewportOffsetChange.TableHeader': tableHeaderOffsetChangeHandler
   });
   $.extend(TableHeader, {