diff --git a/demos/blocklyfactory/workspacefactory/wfactory_controller.js b/demos/blocklyfactory/workspacefactory/wfactory_controller.js
index 5f9d45e70..97ca7627c 100644
--- a/demos/blocklyfactory/workspacefactory/wfactory_controller.js
+++ b/demos/blocklyfactory/workspacefactory/wfactory_controller.js
@@ -1248,6 +1248,7 @@ WorkspaceFactoryController.prototype.setBlockLibCategory =
 
   // Update the toolbox and toolboxWorkspace.
   this.toolbox.replaceChild(categoryXml, blockLibCategory);
+  this.toolboxWorkspace.toolbox_.clearSelection();
   this.toolboxWorkspace.updateToolbox(this.toolbox);
 
   // Update the block library types.