diff --git a/bundles/org.openhab.ui/web/src/pages/addons/addons-store.vue b/bundles/org.openhab.ui/web/src/pages/addons/addons-store.vue
index 2d1bfcf892..d8f30d5c4f 100644
--- a/bundles/org.openhab.ui/web/src/pages/addons/addons-store.vue
+++ b/bundles/org.openhab.ui/web/src/pages/addons/addons-store.vue
@@ -309,6 +309,10 @@ export default {
       this.stopEventSource()
     },
     load () {
+      if (this.searchFor) {
+        // Show this in the searchbar while the page is loading
+        this.$refs.storeSearchbar.f7Searchbar.$inputEl.val(this.searchFor)
+      }
       this.stopEventSource()
       this.$oh.api.get('/rest/services/org.openhab.i18n/config').then((data) => {
         if (data.region) {
@@ -367,7 +371,7 @@ export default {
         results = results.filter((a) => a.type === this.currentTab)
       }
       query = query.toLowerCase()
-      results = results.filter((a) => a.label.toLowerCase().indexOf(query) >= 0)
+      results = results.filter((a) => a.id.includes(query) || a.label.toLowerCase().includes(query))
 
       this.$set(this, 'query', query)
       this.$set(this, 'searchResults', results)