diff --git a/public/assets/pages/viewerpage/application_audio.js b/public/assets/pages/viewerpage/application_audio.js
index 15ec37f7..5b9137d0 100644
--- a/public/assets/pages/viewerpage/application_audio.js
+++ b/public/assets/pages/viewerpage/application_audio.js
@@ -12,16 +12,16 @@ import { renderMenubar, buttonDownload } from "./component_menubar.js";
 
 import { ICON } from "./common_icon.js";
 import { formatTimecode } from "./common_player.js";
-import { transition, getFilename, getDownloadUrl } from "./common.js";
+import { transition } from "./common.js";
 
 const STATUS_PLAYING = "PLAYING";
 const STATUS_PAUSED = "PAUSED";
 const STATUS_BUFFERING = "BUFFERING";
 
-export default function(render) {
+export default function(render, { getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_audioplayer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div class="audioplayer_container">
                 <div class="audioplayer_box">
                     <div data-bind="loader" class="hidde">
diff --git a/public/assets/pages/viewerpage/application_downloader.js b/public/assets/pages/viewerpage/application_downloader.js
index 04ba3d25..bd7f87ae 100644
--- a/public/assets/pages/viewerpage/application_downloader.js
+++ b/public/assets/pages/viewerpage/application_downloader.js
@@ -5,15 +5,14 @@ import { loadCSS } from "../../helpers/loader.js";
 import t from "../../locales/index.js";
 import ctrlError from "../ctrl_error.js";
 
-import { transition, getFilename, getDownloadUrl } from "./common.js";
-
+import { transition } from "./common.js";
 import "../../components/icon.js";
 import "./component_menubar.js";
 
-export default async function(render, { acl$ }) {
+export default async function(render, { acl$, getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_filedownloader">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div class="download_button no-select">
                 <a download="${getFilename()}" href="${getDownloadUrl()}">${t("DOWNLOAD")}</a>
                 <component-icon name="loading" class="hidden"></component-icon>
diff --git a/public/assets/pages/viewerpage/application_ebook.js b/public/assets/pages/viewerpage/application_ebook.js
index 9f4b47c7..ac9f73b0 100644
--- a/public/assets/pages/viewerpage/application_ebook.js
+++ b/public/assets/pages/viewerpage/application_ebook.js
@@ -6,14 +6,12 @@ import { loadJS, loadCSS } from "../../helpers/loader.js";
 import { createLoader } from "../../components/loader.js";
 import ctrlError from "../ctrl_error.js";
 
-import { getFilename, getDownloadUrl } from "./common.js";
-
 import { renderMenubar, buttonDownload } from "./component_menubar.js";
 
-export default function(render) {
+export default function(render, { getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_ebookviewer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div class="ebookviewer_container" data-bind="epub"></div>
         </div>
     `);
diff --git a/public/assets/pages/viewerpage/application_editor.js b/public/assets/pages/viewerpage/application_editor.js
index 42951dcf..37ba9267 100644
--- a/public/assets/pages/viewerpage/application_editor.js
+++ b/public/assets/pages/viewerpage/application_editor.js
@@ -11,7 +11,6 @@ import t from "../../locales/index.js";
 
 import ctrlError from "../ctrl_error.js";
 import ctrlDownloader, { init as initDownloader } from "./application_downloader.js";
-import { getFilename, getDownloadUrl } from "./common.js";
 import { $ICON } from "./common_fab.js";
 import { cat, save } from "./model_files.js";
 
@@ -21,10 +20,10 @@ import "../../components/icon.js";
 
 const TIME_BEFORE_ABORT_EDIT = 5000;
 
-export default async function(render, { acl$ }) {
+export default async function(render, { acl$, getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_ide">
-            <component-menubar class="hidden"></component-menubar>
+            <component-menubar filename="${getFilename()}" class="hidden"></component-menubar>
             <div class="component_editor hidden"></div>
             <button is="component-fab" class="hidden"></button>
         </div>
diff --git a/public/assets/pages/viewerpage/application_form.js b/public/assets/pages/viewerpage/application_form.js
index 6efd2adb..cfa347bb 100644
--- a/public/assets/pages/viewerpage/application_form.js
+++ b/public/assets/pages/viewerpage/application_form.js
@@ -16,10 +16,10 @@ import "./component_menubar.js";
 import "../../components/icon.js";
 import "../../components/fab.js";
 
-export default function(render, { acl$ }) {
+export default function(render, { acl$, getFilename }) {
     const $page = createElement(`
         <div class="component_formviewer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div class="formviewer_container hidden">
                 <form class="sticky box"></form>
             </div>
diff --git a/public/assets/pages/viewerpage/application_image.js b/public/assets/pages/viewerpage/application_image.js
index 84419acd..a6beb91e 100644
--- a/public/assets/pages/viewerpage/application_image.js
+++ b/public/assets/pages/viewerpage/application_image.js
@@ -11,17 +11,17 @@ import t from "../../locales/index.js";
 import ctrlError from "../ctrl_error.js";
 import { Chromecast } from "../../model/chromecast.js";
 
-import { transition, getFilename, getDownloadUrl } from "./common.js";
+import { transition } from "./common.js";
 
 import componentMetadata, { init as initMetadata } from "./application_image_metadata.js";
 import componentPager, { init as initPager } from "./component_pager.js";
 
 import { renderMenubar, buttonDownload, buttonFullscreen } from "./component_menubar.js";
 
-export default function(render) {
+export default function(render, { getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_imageviewer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div class="component_image_container">
                 <div class="images_wrapper">
                     <img class="photo idle hidden" src="${getDownloadUrl()}&size=${window.innerWidth}">
diff --git a/public/assets/pages/viewerpage/application_pdf.js b/public/assets/pages/viewerpage/application_pdf.js
index d59535f6..fc78bd10 100644
--- a/public/assets/pages/viewerpage/application_pdf.js
+++ b/public/assets/pages/viewerpage/application_pdf.js
@@ -6,22 +6,22 @@ import { loadCSS, loadJS } from "../../helpers/loader.js";
 import { join } from "../../lib/path.js";
 import ctrlError from "../ctrl_error.js";
 
-import { transition, getFilename, getDownloadUrl } from "./common.js";
+import { transition } from "./common.js";
 import { renderMenubar, buttonDownload } from "./component_menubar.js";
 
 import "../../components/icon.js";
 
 const hasNativePDF = "application/pdf" in window.navigator.mimeTypes && !!window.chrome;
 
-export default async function(render) {
+export default async function(render, opts) {
     const ctrl = hasNativePDF ? ctrlPDFNative : ctrlPDFJs;
-    ctrl(render);
+    ctrl(render, opts);
 }
 
-function ctrlPDFNative(render) {
+function ctrlPDFNative(render, { getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_pdfviewer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div data-bind="pdf">
                 <embed
                     class="hidden"
@@ -43,10 +43,10 @@ function ctrlPDFNative(render) {
     ));
 }
 
-async function ctrlPDFJs(render) {
+async function ctrlPDFJs(render, { getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_pdfviewer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div data-bind="pdf"></div>
         </div>
     `);
diff --git a/public/assets/pages/viewerpage/application_video.js b/public/assets/pages/viewerpage/application_video.js
index be84b266..c41a741b 100644
--- a/public/assets/pages/viewerpage/application_video.js
+++ b/public/assets/pages/viewerpage/application_video.js
@@ -10,7 +10,7 @@ import Hls from "../../lib/vendor/hlsjs/hls.js";
 
 import ctrlError from "../ctrl_error.js";
 
-import { transition, getFilename, getDownloadUrl } from "./common.js";
+import { transition } from "./common.js";
 import { formatTimecode } from "./common_player.js";
 import { ICON } from "./common_icon.js";
 import { renderMenubar, buttonDownload, buttonFullscreen } from "./component_menubar.js";
@@ -21,10 +21,10 @@ const STATUS_PLAYING = "PLAYING";
 const STATUS_PAUSED = "PAUSED";
 const STATUS_BUFFERING = "BUFFERING";
 
-export default function(render, { mime }) {
+export default function(render, { mime, getFilename, getDownloadUrl }) {
     const $page = createElement(`
         <div class="component_videoplayer">
-            <component-menubar></component-menubar>
+            <component-menubar filename="${getFilename()}"></component-menubar>
             <div class="video_container">
                 <span>
                     <div class="video_screen video-state-pause is-casting-no">