diff --git a/dashboard/public/js/index.js b/dashboard/public/js/index.js
index 3a9302367..fdda25cc8 100644
--- a/dashboard/public/js/index.js
+++ b/dashboard/public/js/index.js
@@ -59,8 +59,8 @@ app.config(['$routeProvider', function ($routeProvider) {
         // controller: 'AppStoreController',
         // templateUrl: 'views/appstore.html?' + window.VITE_CACHE_ID
     }).when('/appstore/:appId', {
-        controller: 'AppStoreController',
-        templateUrl: 'views/appstore.html?' + window.VITE_CACHE_ID
+        // controller: 'AppStoreController',
+        // templateUrl: 'views/appstore.html?' + window.VITE_CACHE_ID
     }).when('/apps', {
         // controller: 'AppsController',
         // templateUrl: 'views/apps.html?' + window.VITE_CACHE_ID
diff --git a/dashboard/src/components/AppstoreView.vue b/dashboard/src/components/AppstoreView.vue
index 448e65ffb..bcd7f1325 100644
--- a/dashboard/src/components/AppstoreView.vue
+++ b/dashboard/src/components/AppstoreView.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="content">
-    <AppInstallDialog ref="appInstallDialog" />
+    <AppInstallDialog ref="appInstallDialog" @close="onAppInstallDialogClose"/>
 
     <div class="filter-bar">
       <div></div>
@@ -12,7 +12,7 @@
     </div>
 
     <div v-if="!search">
-      <h4>{{ $t('appstore.category.popular') }}</h4>
+      <h4 v-show="filteredPopularApps.length">{{ $t('appstore.category.popular') }}</h4>
       <TransitionGroup name="grid-animation" tag="div" class="grid" v-show="ready">
         <div class="item" v-for="app in filteredPopularApps" :key="app.id" :ref="'item-' + app.id" @click="onInstall(app)">
           <img class="icon" :src="app.iconUrl" />
@@ -23,7 +23,7 @@
         </div>
       </TransitionGroup>
 
-      <h4>{{ $t('appstore.category.all') }}</h4>
+      <h4 v-show="filteredAllApps.length">{{ $t('appstore.category.all') }}</h4>
       <TransitionGroup name="grid-animation" tag="div" class="grid" v-show="ready">
         <div class="item" v-for="app in filteredAllApps" :key="app.id" :ref="'item-' + app.id" @click="onInstall(app)">
           <img class="icon" :src="app.iconUrl" />
@@ -84,16 +84,35 @@ const filteredPopularApps = computed(() => {
 const appInstallDialog = useTemplateRef('appInstallDialog');
 const searchInput = useTemplateRef('searchInput');
 
+function onAppInstallDialogClose() {
+  window.location.href = '/#/appstore';
+}
+
 function onInstall(app) {
+  window.location.href = `/#/appstore/${app.manifest.id}?version=${app.manifest.version}`;
   appInstallDialog.value.open(app);
 }
 
 onMounted(async () => {
   apps.value = await appstoreModel.list();
-
   ready.value = true;
 
-  setTimeout(() => searchInput.value.$el.focus(), 0);
+  const query = window.location.hash.slice('#/appstore/'.length);
+  if (query) {
+    const appId = query.split('?')[0];
+    const version = query.slice(query.indexOf('version=')+'version='.length);
+
+    console.log(appId, version)
+
+    const app = await appstoreModel.get(appId, version);
+    if (app) {
+      appInstallDialog.value.open(app);
+    } else {
+      console.error('No such version found');
+    }
+  } else {
+    searchInput.value.$el.focus();
+  }
 });
 
 </script>
diff --git a/dashboard/src/components/Index.vue b/dashboard/src/components/Index.vue
index 8e7dcd7d4..e1008e1a9 100644
--- a/dashboard/src/components/Index.vue
+++ b/dashboard/src/components/Index.vue
@@ -62,7 +62,7 @@ export default {
 
       if (view === VIEWS.APPS) {
         that.view = VIEWS.APPS;
-      } else if (view === VIEWS.APPSTORE) {
+      } else if (view.indexOf(VIEWS.APPSTORE) === 0) {
         that.view = VIEWS.APPSTORE;
       } else if (view === VIEWS.SUPPORT) {
         that.view = VIEWS.SUPPORT;
diff --git a/dashboard/src/models/AppstoreModel.js b/dashboard/src/models/AppstoreModel.js
index b67b48b87..9839ad179 100644
--- a/dashboard/src/models/AppstoreModel.js
+++ b/dashboard/src/models/AppstoreModel.js
@@ -19,6 +19,24 @@ function create(origin, accessToken) {
 
       return result.body.apps;
     },
+    async get(id, version = '') {
+      let url = `${origin}/api/v1/appstore/apps/${id}`;
+      if (version && version !== 'latest') url += `/versions/${version}`;
+
+      let error, result;
+      try {
+        result = await fetcher.get(url, { access_token: accessToken });
+      } catch (e) {
+        error = e;
+      }
+
+      if (error || result.status !== 200) {
+        console.error('Failed to get app.', error || result.status);
+        return null;
+      }
+
+      return result.body;
+    },
   };
 }