diff --git a/dashboard/src/views/AppstoreView.vue b/dashboard/src/views/AppstoreView.vue
index daf5255e1..53c2d823b 100644
--- a/dashboard/src/views/AppstoreView.vue
+++ b/dashboard/src/views/AppstoreView.vue
@@ -106,8 +106,11 @@ const categories = [
   { id: 'wiki', label: 'Wiki'},
 ];
 
-function onAppInstallDialogClose() {
+async function onAppInstallDialogClose() {
   window.location.href = '#/appstore';
+
+  await nextTick();
+  if (searchInput.value) searchInput.value.$el.focus();
 }
 
 function onInstall(app) {
@@ -162,9 +165,6 @@ async function onHashChange() {
         confirmLabel: t('main.dialog.close'),
       });
     }
-  } else {
-    await nextTick();
-    if (searchInput.value) searchInput.value.$el.focus();
   }
 }