diff --git a/tools/devtools/src/devtools_app/store/store.js b/tools/devtools/src/devtools_app/store/store.js
index cf6b919e..b45e4acc 100644
--- a/tools/devtools/src/devtools_app/store/store.js
+++ b/tools/devtools/src/devtools_app/store/store.js
@@ -115,6 +115,9 @@ export const store = reactive({
     }
     keepEnvLit(details);
     this.activeComponent = details;
+    if (this.componentSearch.search.length) {
+      this.updateSearch(this.componentSearch.search);
+    }
   },
 
   // Select a component by retrieving its details from the page based on its path