diff --git a/dashboard/src/components/FolderView.vue b/dashboard/src/components/FolderView.vue
index e5ba12c26..ef0c33062 100644
--- a/dashboard/src/components/FolderView.vue
+++ b/dashboard/src/components/FolderView.vue
@@ -32,10 +32,8 @@
           <Breadcrumb :home="breadcrumbHomeItem" :items="breadcrumbItems" :activate-handler="onActivateBreadcrumb"/>
         </template>
         <template #right>
-          <Button icon="fa-solid fa-plus" @click="onCreateMenu">{{ $t('filemanager.toolbar.new') }}</Button>
-          <Menu ref="createMenu" :model="createMenuModel"/>
-          <Button icon="fa-solid fa-upload" @click="onUploadMenu">{{ $t('filemanager.toolbar.upload') }}</Button>
-          <Menu ref="uploadMenu" :model="uploadMenuModel"/>
+          <Button icon="fa-solid fa-plus" :menu="createMenuModel">{{ $t('filemanager.toolbar.new') }}</Button>
+          <Button icon="fa-solid fa-upload" :menu="uploadMenuModel">{{ $t('filemanager.toolbar.upload') }}</Button>
 
           <Button style="margin-left: 20px;" :title="$t('filemanager.toolbar.restartApp')" secondary tool :loading="busyRestart" icon="fa-solid fa-arrows-rotate" @click="onRestartApp" v-show="resourceType === 'app'"/>
           <Button :href="'/terminal.html?id=' + resourceId" target="_blank" v-show="resourceType === 'app'" secondary tool icon="fa-solid fa-terminal" :title="$t('terminal.title')" />
@@ -277,12 +275,6 @@ export default {
       this.fatalError = errorMessage;
       this.$refs.fatalErrorDialog.open();
     },
-    onCreateMenu(event, elem = null) {
-      this.$refs.createMenu.open(event, elem);
-    },
-    onUploadMenu(event, elem = null) {
-      this.$refs.uploadMenu.open(event, elem);
-    },
     onCancelUpload() {
       if (!this.uploadRequest || !this.uploadRequest.xhr) return;
       this.uploadRequest.xhr.abort();