diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue b/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue
new file mode 100644
index 0000000000..19dc35e3d5
--- /dev/null
+++ b/platypush/backend/http/webapp/src/components/panels/Media/Browser.vue
@@ -0,0 +1,86 @@
+<template>
+  <keep-alive>
+    <div class="media-browser">
+      <Loading v-if="loading" />
+
+      <div class="media-index grid" v-else-if="!collection">
+        <div class="item" @click="collection = 'files'">
+          <div class="icon">
+            <i class="fas fa-folder"></i>
+          </div>
+          <div class="name">
+            Files
+          </div>
+        </div>
+      </div>
+
+      <div class="media-browser fade-in" v-else>
+        <Browser :is-media="true"
+           :filter="filter"
+           :has-back="true"
+           @back="collection = null"
+           @path-change="$emit('path-change', $event)"
+           @play="$emit('play', $event)"
+           v-if="collection === 'files'" />
+      </div>
+    </div>
+  </keep-alive>
+</template>
+
+<script>
+import Browser from "@/components/File/Browser";
+import Loading from "@/components/Loading";
+
+export default {
+  emits: ['path-change', 'play'],
+  components: {
+    Browser,
+    Loading,
+  },
+
+  props: {
+    filter: {
+      type: String,
+      default: '',
+    },
+  },
+
+  data() {
+    return {
+      loading: false,
+      collection: null,
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.media-browser {
+  height: 100%;
+
+  .item {
+    height: 100px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: $default-border-2;
+    cursor: pointer;
+
+    &:hover {
+      background: $hover-bg;
+    }
+
+    .icon {
+      height: 60%;
+      display: inline-flex;
+      justify-content: center;
+      opacity: 0.5;
+
+      i {
+        font-size: 40px;
+      }
+    }
+  }
+}
+</style>
diff --git a/platypush/backend/http/webapp/src/components/panels/Media/Index.vue b/platypush/backend/http/webapp/src/components/panels/Media/Index.vue
index 4f8e6f7fda..32c5259ef1 100644
--- a/platypush/backend/http/webapp/src/components/panels/Media/Index.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Media/Index.vue
@@ -48,9 +48,7 @@
                            @play="play"
                            v-else-if="selectedView === 'torrents'" />
 
-              <Browser :plugin-name="torrentPlugin"
-                       :is-media="true"
-                       :filter="browserFilter"
+              <Browser :filter="browserFilter"
                        @path-change="browserFilter = ''"
                        @play="play($event)"
                        v-else-if="selectedView === 'browser'" />
@@ -84,7 +82,7 @@ import Loading from "@/components/Loading";
 import Modal from "@/components/Modal";
 import Utils from "@/Utils";
 
-import Browser from "@/components/File/Browser";
+import Browser from "@/components/panels/Media/Browser";
 import Header from "@/components/panels/Media/Header";
 import MediaUtils from "@/components/Media/Utils";
 import MediaView from "@/components/Media/View";