diff --git a/dashboard/src/logs.html b/dashboard/src/logs.html
index 062856f18..6599e8107 100644
--- a/dashboard/src/logs.html
+++ b/dashboard/src/logs.html
@@ -71,7 +71,7 @@
       <!-- logs actions -->
       <div class="pull-right">
         <a class="btn btn-primary" ng-href="{{ '/terminal.html?id=' + selected.value }}" target="_blank" ng-show="selected.type === 'app'"><i class="fa fa-terminal"></i> {{ 'terminal.title' | tr }}</a>
-        <a class="btn btn-primary" ng-href="{{ '/filemanager.html?type=app&id=' + selected.value }}" target="_blank" ng-show="selected.type === 'app'"><i class="fas fa-folder"></i> {{ 'filemanager.title' | tr }}</a>
+        <a class="btn btn-primary" ng-href="{{ '/filemanager/app/' + selected.value }}" target="_blank" ng-show="selected.type === 'app'"><i class="fas fa-folder"></i> {{ 'filemanager.title' | tr }}</a>
         <a class="btn btn-primary" ng-click="clear()"><i class="fa fa-trash"></i> {{ 'logs.clear' | tr }}</a>
         <a class="btn btn-primary" ng-href="{{ selected.url }}&format=short&lines=-1"><i class="fa fa-download"></i> {{ 'logs.download' | tr }}</a>
       </div>
diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html
index 08b82b23c..ecd51fba8 100644
--- a/dashboard/src/views/app.html
+++ b/dashboard/src/views/app.html
@@ -583,7 +583,7 @@
           <div class="btn-group btn-group-sm" role="group">
             <a class="btn btn-sm btn-default" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.logsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-align-left"></i></a>
             <a class="btn btn-sm btn-default" ng-if="app.type !== APP_TYPES.PROXIED" ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.terminalActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fa fa-terminal"></i></a>
-            <a class="btn btn-sm btn-default" ng-if="app.manifest.addons.localstorage" ng-href="{{ '/filemanager.html?type=app&id=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a>
+            <a class="btn btn-sm btn-default" ng-if="app.manifest.addons.localstorage" ng-href="{{ '/filemanager/#/home/app/' + app.id }}" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a>
           </div>
           <div class="dropdown" style="display: inline-block">
             <button class="btn btn-sm btn-default dropdown-toggle" type="button" data-toggle="dropdown" uib-tooltip="{{ 'app.docsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom">
diff --git a/dashboard/src/views/volumes.html b/dashboard/src/views/volumes.html
index e5e0993cb..4f4fda775 100644
--- a/dashboard/src/views/volumes.html
+++ b/dashboard/src/views/volumes.html
@@ -153,7 +153,7 @@
               <td class="text-left wrap-table-cell hidden-xs hidden-sm" ng-show="volume.mountType === 'mountpoint' || volume.mountType === 'filesystem'">{{ volume.hostPath }}</td>
               <td class="text-right no-wrap" style="vertical-align: bottom">
                 <button class="btn btn-xs btn-default" ng-click="remount(volume)" ng-show="isMountProvider(volume.mountType)" ng-disabled="volume.remounting" uib-tooltip="{{ 'volumes.remountActionTooltip' | tr }}"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': volume.remounting }"></i></button>
-                <a class="btn btn-xs btn-default" ng-href="{{ '/filemanager.html?type=volume&id=' + volume.id }}" target="_blank" uib-tooltip="{{ 'volumes.openFileManagerActionTooltip' | tr }}"><i class="fas fa-folder"></i></a>
+                <a class="btn btn-xs btn-default" ng-href="{{ '/filemanager/volume/' + volume.id }}" target="_blank" uib-tooltip="{{ 'volumes.openFileManagerActionTooltip' | tr }}"><i class="fas fa-folder"></i></a>
                 <button class="btn btn-xs btn-danger" ng-click="volumeRemove.show(volume)" uib-tooltip="{{ 'volumes.removeVolumeActionTooltip' | tr }}"><i class="far fa-trash-alt"></i></button>
               </td>
             </tr>
diff --git a/filemanager/src/views/Home.vue b/filemanager/src/views/Home.vue
index 83830ca5c..24e5807b2 100644
--- a/filemanager/src/views/Home.vue
+++ b/filemanager/src/views/Home.vue
@@ -36,7 +36,6 @@
           <Menu ref="createMenu" id="create_menu" :model="createMenuModel" :popup="true" />
           <Button type="button" label="Upload" icon="pi pi-upload" @click="onUploadMenu" aria-haspopup="true" aria-controls="upload_menu" style="margin-right: 10px" />
           <Menu ref="uploadMenu" id="upload_menu" :model="uploadMenuModel" :popup="true" />
-          <Dropdown v-model="activeResource" filter :options="resourcesDropdownModel" optionLabel="label" optionGroupLabel="label" optionGroupChildren="items" dataKey="id" @change="onAppChange" placeholder="Select an App or Volume" style="margin-right: 10px" />
         </template>
       </TopBar>
     </template>
@@ -87,7 +86,6 @@ import superagent from 'superagent';
 
 import Button from 'primevue/button';
 import Dialog from 'primevue/dialog';
-import Dropdown from 'primevue/dropdown';
 import InputText from 'primevue/inputtext';
 import Menu from 'primevue/menu';
 
@@ -109,7 +107,6 @@ export default {
     Button,
     Dialog,
     DirectoryView,
-    Dropdown,
     FileUploader,
     InputText,
     MainLayout,
@@ -131,11 +128,6 @@ export default {
       },
       accessToken: localStorage.token,
       apiOrigin: API_ORIGIN || '',
-      apps: [],
-      volumes: [],
-      resources: [],
-      resourcesDropdownModel: [],
-      selectedAppId: '',
       activeResource: null,
       visible: true,
       newFileDialog: {
@@ -360,78 +352,34 @@ export default {
   async mounted() {
     useConfirm();
 
-    // load all apps
-    let error, result;
-    try {
-      result = await superagent.get(`${this.apiOrigin}/api/v1/apps`).query({ access_token: this.accessToken });
-    } catch (e) {
-      error = e;
-    }
-
-    if (error || result.statusCode !== 200) {
-      console.error('Failed to list apps', error || result.statusCode);
-      this.apps = [];
-    } else {
-      this.apps = result.body ? result.body.apps.filter(a => !!a.manifest.addons.localstorage) : [];
-    }
-    this.apps.forEach(function (a) { a.type = 'app'; a.label = a.fqdn; });
-
-    // load all volumes
-    try {
-      result = await superagent.get(`${this.apiOrigin}/api/v1/volumes`).query({ access_token: this.accessToken });
-    } catch (e) {
-      error = e;
-    }
-
-    if (error || result.statusCode !== 200) {
-      console.error('Failed to list volumes', error || result.statusCode);
-      this.volumes = [];
-    } else {
-      this.volumes = result.body ? result.body.volumes : [];
-    }
-    this.volumes.forEach(function (a) { a.type = 'volume'; a.label = a.name; });
-
-    this.resources = this.apps.concat(this.volumes);
-
-    this.resourcesDropdownModel = [{
-      label: 'Apps',
-      items: this.apps
-    }, {
-      label: 'Volumes',
-      items: this.volumes
-    }];
-
     const type = this.$route.params.type || 'app';
     const resourceId = this.$route.params.resourceId;
 
-    if (type === 'volume') {
-      this.activeResource = this.volumes.find(a => a.id === resourceId);
-      if (!this.activeResource) this.activeResource = this.volumes[0];
-      if (!this.activeResource) return console.error('Unable to find volumes', resourceId);
-    } else if (type === 'app') {
-      this.activeResource = this.apps.find(a => a.id === resourceId);
-      if (!this.activeResource) this.activeResource = this.apps[0];
-      if (!this.activeResource) return console.error('Unable to find app', resourceId);
-    } else {
-      this.activeResource = this.apps[0];
-    }
-
-    if (!this.activeResource) {
-      console.error('Not able to load apps or volumes. Cannot continue');
-      return;
-    }
+    // load via api to test
+    const resource = {
+      fqdn: 'FIXME',
+      type,
+      id: resourceId
+    };
 
     this.cwd = sanitize('/' + (this.$route.params.cwd ? this.$route.params.cwd.join('/') : '/'));
 
-    this.loadResource(this.activeResource);
+    this.loadResource(resource);
 
     this.$watch(() => this.$route.params, (toParams, previousParams) => {
-      if (toParams.type === 'volume') {
-        this.activeResource = this.volumes.find(a => a.id === toParams.resourceId);
-      } else if (toParams.type === 'app') {
-        this.activeResource = this.apps.find(a => a.id === toParams.resourceId);
-      } else {
+      if (toParams.type !== 'app' && toParams.type !== 'volume') {
         console.error(`Unknown type ${toParams.type}`);
+        return;
+      }
+
+      if ((toParams.type !== this.activeResource.type) || (toParams.resourceId !== this.activeResource.id)) {
+        const resource = {
+          fqdn: 'FIXME',
+          type: toParams.type,
+          id: toParams.resourceId
+        };
+
+        this.loadResource(resource);
       }
 
       this.cwd = toParams.cwd ? `/${toParams.cwd.join('/')}` : '/';