diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 2ea34d2203cdd4a598bbbb5d77a96199c9b80ba1..cd3d4ff5383e60427b86bd11cf4137b93b6b5ee9 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -145,10 +145,9 @@ class Blocks extends React.Component {
                 this.setLocale();
             } else {
                 this.props.vm.refreshWorkspace();
+                this.updateToolbox();
             }
 
-            // Re-enable toolbox refreshes without causing one. See #updateToolbox for more info.
-            this.workspace.toolboxRefreshEnabled_ = true;
             window.dispatchEvent(new Event('resize'));
         } else {
             this.workspace.setVisible(false);
@@ -165,8 +164,8 @@ class Blocks extends React.Component {
         this.ScratchBlocks.ScratchMsgs.setLocale(this.props.locale);
         this.props.vm.setLocale(this.props.locale, this.props.messages)
             .then(() => {
-                this.workspace.updateToolbox(this.props.toolboxXML);
                 this.props.vm.refreshWorkspace();
+                this.updateToolbox();
                 this.workspace.getFlyout().setRecyclingEnabled(true);
             });
     }