diff --git a/packages/builder/src/userInterface/ComponentSelectionList.svelte b/packages/builder/src/userInterface/ComponentSelectionList.svelte
index cf10bd0586..6c880fcee7 100644
--- a/packages/builder/src/userInterface/ComponentSelectionList.svelte
+++ b/packages/builder/src/userInterface/ComponentSelectionList.svelte
@@ -51,8 +51,8 @@
       onTemplateChosen(component.template)
     } else {
       store.addChildComponent(component.name)
+      toggleTab()
     }
-    toggleTab();
   }
 
   const onTemplateChosen = template => {
@@ -75,6 +75,7 @@
     selectedComponent = null
     const instance = templateInstances.find(i => i.name === selectedTemplateInstance)
     store.addTemplatedComponent(instance.props)
+    toggleTab()
   }
 
   function generate_components_list(components) {