diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 59dd1a539..471dc6cd0 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -195,8 +195,6 @@ class Blocks extends React.Component {
         const dynamicBlocksXML = this.props.vm.runtime.getBlocksXML();
         const toolboxXML = makeToolboxXML(dynamicBlocksXML);
         this.props.onExtensionAdded(toolboxXML);
-        const categoryName = blocksInfo[0].json.category;
-        this.handleCategorySelected(categoryName);
     }
     handleCategorySelected (categoryName) {
         this.workspace.toolbox_.setSelectedCategoryByName(categoryName);
diff --git a/src/containers/extension-library.jsx b/src/containers/extension-library.jsx
index 071427409..09fd65ff3 100644
--- a/src/containers/extension-library.jsx
+++ b/src/containers/extension-library.jsx
@@ -22,7 +22,9 @@ class ExtensionLibrary extends React.PureComponent {
             if (this.props.vm.extensionManager.isExtensionLoaded(url)) {
                 this.props.onCategorySelected(item.name);
             } else {
-                this.props.vm.extensionManager.loadExtensionURL(url);
+                this.props.vm.extensionManager.loadExtensionURL(url).then(() => {
+                    this.props.onCategorySelected(item.name);
+                });
             }
         }
     }