diff --git a/components/views/files/aside/Aside.html b/components/views/files/aside/Aside.html
index 098a16d0ec..6ca46899b8 100644
--- a/components/views/files/aside/Aside.html
+++ b/components/views/files/aside/Aside.html
@@ -17,10 +17,10 @@
 
   <div>
     <TypographyText :size="6" :text="$t('pages.files.aside.quick_access')" />
-    <UiSimpleList :items="quickAccessOptions" />
+    <FilesAsideList :items="quickAccessOptions" />
   </div>
   <div>
     <TypographyText :size="6" :text="$t('pages.files.aside.shared_items')" />
-    <UiSimpleList :items="sharedItemsOptions" />
+    <FilesAsideList :items="sharedItemsOptions" />
   </div>
 </div>
diff --git a/components/ui/SimpleList/SimpleList.html b/components/views/files/aside/List/List.html
similarity index 70%
rename from components/ui/SimpleList/SimpleList.html
rename to components/views/files/aside/List/List.html
index 263cabaf90..d033269acd 100644
--- a/components/ui/SimpleList/SimpleList.html
+++ b/components/views/files/aside/List/List.html
@@ -1,7 +1,7 @@
 <ul class="menu-list">
   <li
     v-for="item in items"
-    :class="[{'is-active' : isActiveRoute(item.route)}, {'no-icon' : !item.icon}]"
+    :class="{'is-active' : isActiveRoute(item.route)}"
     @click="setActive(item.route)"
   >
     <component v-if="item.icon" :is="icons[item.icon]" size="1x" />
diff --git a/components/ui/SimpleList/SimpleList.less b/components/views/files/aside/List/List.less
similarity index 100%
rename from components/ui/SimpleList/SimpleList.less
rename to components/views/files/aside/List/List.less
diff --git a/components/ui/SimpleList/SimpleList.vue b/components/views/files/aside/List/List.vue
similarity index 75%
rename from components/ui/SimpleList/SimpleList.vue
rename to components/views/files/aside/List/List.vue
index f743a02357..8a16e588cd 100644
--- a/components/ui/SimpleList/SimpleList.vue
+++ b/components/views/files/aside/List/List.vue
@@ -1,4 +1,4 @@
-<template src="./SimpleList.html"></template>
+<template src="./List.html"></template>
 
 <script lang="ts">
 import Vue, { PropType } from 'vue'
@@ -46,13 +46,7 @@ export default Vue.extend({
       this.$router.push({ query: { route } })
     },
     isActiveRoute(route: FileAsideRouteEnum) {
-      if (!this.$route.query.route && route === FileAsideRouteEnum.DEFAULT) {
-        return true
-      }
-      if (
-        !Object.values(FileAsideRouteEnum).includes(this.$route.query.route) &&
-        route === FileAsideRouteEnum.DEFAULT
-      ) {
+      if (!this.$route.query.route && !route) {
         return true
       }
       return route === this.$route.query.route
@@ -61,4 +55,4 @@ export default Vue.extend({
 })
 </script>
 
-<style scoped lang="less" src="./SimpleList.less"></style>
+<style scoped lang="less" src="./List.less"></style>
diff --git a/components/views/files/list/List.html b/components/views/files/list/List.html
index 293880f832..1b9f542bec 100644
--- a/components/views/files/list/List.html
+++ b/components/views/files/list/List.html
@@ -2,14 +2,16 @@
   <thead>
     <th @click="setSort(FileSortEnum.NAME)">
       {{ $t('pages.files.browse.name') }}
-      <template v-if="sort.category===FileSortEnum.NAME">
+      <template v-if="sort.category===FileSortEnum.NAME && !$route.query.route">
         <chevron-up-icon v-if="sort.asc" size="1x" />
         <chevron-down-icon v-else size="1x" />
       </template>
     </th>
     <th @click="setSort(FileSortEnum.MODIFIED)">
       {{ $t('pages.files.browse.modified') }}
-      <template v-if="sort.category===FileSortEnum.MODIFIED">
+      <template
+        v-if="sort.category===FileSortEnum.MODIFIED && !$route.query.route"
+      >
         <chevron-up-icon v-if="sort.asc" size="1x" />
         <chevron-down-icon v-else size="1x" />
       </template>
@@ -20,14 +22,14 @@
       class="open-sidebar-hide"
     >
       {{ $t('pages.files.browse.type') }}
-      <template v-if="sort.category===FileSortEnum.TYPE">
+      <template v-if="sort.category===FileSortEnum.TYPE && !$route.query.route">
         <chevron-up-icon v-if="sort.asc" size="1x" />
         <chevron-down-icon v-else size="1x" />
       </template>
     </th>
     <th @click="setSort(FileSortEnum.SIZE)" class="open-sidebar-hide">
       {{ $t('pages.files.browse.size') }}
-      <template v-if="sort.category===FileSortEnum.SIZE">
+      <template v-if="sort.category===FileSortEnum.SIZE && !$route.query.route">
         <chevron-up-icon v-if="sort.asc" size="1x" />
         <chevron-down-icon v-else size="1x" />
       </template>
diff --git a/pages/files/browse/index.vue b/pages/files/browse/index.vue
index 3fb3fed699..62288fc226 100644
--- a/pages/files/browse/index.vue
+++ b/pages/files/browse/index.vue
@@ -44,11 +44,13 @@ export default Vue.extend({
     },
   },
   watch: {
-    '$route.params.route': {
-      handler() {
+    '$route.query.route': {
+      handler(value) {
         this.fileSystem.goBackToDirectory('root')
+        if (!Object.values(FileAsideRouteEnum).includes(value)) {
+          this.$router.push({ query: {} })
+        }
       },
-      deep: true,
     },
   },
   methods: {