diff --git a/app.config.js b/app.config.js
index 2313713e10c486f124c14cef0c19c635b34270b6..3f756dc9926a350d9345335b7088363a411e8e36 100644
--- a/app.config.js
+++ b/app.config.js
@@ -11,7 +11,8 @@ export default {
         nextcloudName: 'TU Graz cloud',
         pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at',
         hiddenActivities: ['dbp-signature-verification-full'],
-        enableAnnotations: true
+        enableAnnotations: true,
+        enableAdditionalMenu: true
     },
     bs: {
         basePath: '/dist/',
@@ -25,7 +26,8 @@ export default {
         nextcloudName: 'TU Graz cloud',
         pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at',
         hiddenActivities: [],
-        enableAnnotations: true
+        enableAnnotations: true,
+        enableAdditionalMenu: true
     },
     development: {
         basePath: '/apps/signature/',
@@ -39,7 +41,8 @@ export default {
         nextcloudName: 'TU Graz cloud',
         pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at',
         hiddenActivities: ['dbp-signature-verification-full'],
-        enableAnnotations: true
+        enableAnnotations: true,
+        enableAdditionalMenu: true
     },
     demo: {
         basePath: '/apps/signature/',
@@ -53,7 +56,8 @@ export default {
         nextcloudName: 'TU Graz cloud',
         pdfAsQualifiedlySigningServer: 'https://sig-demo.tugraz.at',
         hiddenActivities: ['dbp-signature-verification-full'],
-        enableAnnotations: true
+        enableAnnotations: true,
+        enableAdditionalMenu: true
     },
     production: {
         basePath: '/',
@@ -67,6 +71,7 @@ export default {
         nextcloudName: 'TU Graz cloud',
         pdfAsQualifiedlySigningServer: 'https://sig.tugraz.at',
         hiddenActivities: ['dbp-signature-verification-full'],
-        enableAnnotations: false
+        enableAnnotations: false,
+        enableAdditionalMenu: false
     },
 };
\ No newline at end of file
diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs
index b110f22b25432692b93c3b26e6fec72a662ad455..6026f16036191d7cc715305b8229b61f2a43b378 100644
--- a/assets/dbp-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -68,9 +68,8 @@
     id="app"
     lang="de" entry-point-url="<%= entryPointURL %>"
     file-handling-enabled-targets="local,nextcloud"
-    <%= buildInfo.env !== 'production' && buildInfo.env !== 'local' ? 'show-nextcloud-additional-menu' : '' %>
     <%= enableAnnotations ? 'allow-annotating' : '' %>
-    <%= buildInfo.env !== 'production' && buildInfo.env !== 'local' ? 'show-nextcloud-additional-menu' : '' %>
+    <%= enableAdditionalMenu ? 'show-nextcloud-additional-menu' : '' %>
     nextcloud-web-app-password-url="<%= nextcloudWebAppPasswordURL %>"
     nextcloud-webdav-url="<%= nextcloudWebDavURL %>"
     nextcloud-name="<%= nextcloudName %>"
diff --git a/rollup.config.js b/rollup.config.js
index ceb158f2df239df9886095ae5ac2bcf6e5e814d8..a37b15e82c398b5df23c3070db0a5fd279e852fd 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -43,6 +43,7 @@ if (appEnv in appConfig) {
         pdfAsQualifiedlySigningServer: 'https://test',
         hiddenActivities: [],
         enableAnnotations: true,
+        enableAdditionalMenu: true,
     };
 } else {
     console.error(`Unknown build environment: '${appEnv}', use one of '${Object.keys(appConfig)}'`);
@@ -137,6 +138,7 @@ export default (async () => {
             matomoSiteId: config.matomoSiteId,
             buildInfo: getBuildInfo(appEnv),
             enableAnnotations: config.enableAnnotations,
+            enableAdditionalMenu: config.enableAdditionalMenu,
           }
         }),
         resolve({
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 213ea826f6975c407728135a2ada9ac18941fcef..3cf17b8a278a3595647698aa91f8950c8b2da5f3 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -115,7 +115,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
             addAnnotationInProgress: { type: Boolean, attribute: false },
             queuedFilesAnnotationModes: { type: Array, attribute: false },
             queuedFilesAnnotationSaved: { type: Array, attribute: false },
-            fileHandlingEnabledTargets: {type: String, attribute: 'file-handling-enabled-targets'}
+            fileHandlingEnabledTargets: {type: String, attribute: 'file-handling-enabled-targets'},
+            showNextcloudAdditionalMenu: { type: Boolean, attribute: 'show-nextcloud-additional-menu' },
         };
     }
 
diff --git a/src/dbp-qualified-signature-pdf-upload.metadata.json b/src/dbp-qualified-signature-pdf-upload.metadata.json
index 8ce6b818135419613ee116ac6a39afd16d11ca85..3f9f88cbbf0aab01ce7f107333d4631b2ff5a9c3 100644
--- a/src/dbp-qualified-signature-pdf-upload.metadata.json
+++ b/src/dbp-qualified-signature-pdf-upload.metadata.json
@@ -14,5 +14,5 @@
     "de": "Erlaubt das Hochladen von PDF-Dokumenten, um sie mit einer persönlichen elektronischen Signatur zu versehen",
     "en": "Allows upload of PDF-documents to personally sign them"
   },
-  "subscribe": "lang,entry-point-url,nextcloud-web-app-password-url,nextcloud-webdav-url,nextcloud-name,nextcloud-auth-info,nextcloud-file-url,file-handling-enabled-targets,auth,allow-annotating"
+  "subscribe": "lang,entry-point-url,nextcloud-web-app-password-url,nextcloud-webdav-url,nextcloud-name,nextcloud-auth-info,nextcloud-file-url,file-handling-enabled-targets,auth,allow-annotating,show-nextcloud-additional-menu"
 }