diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index d27e91668..9624372d4 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -25,6 +25,8 @@ class Blocks extends React.Component {
     componentDidMount () {
         const workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options);
         this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
+        const filteredToolbox = this.props.vm.filterToolbox(this.workspace.options.languageTree);
+        this.workspace.updateToolbox(filteredToolbox);
         this.attachVM();
     }
     componentWillUnmount () {