diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 857a8155..2c38479b 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -364,6 +364,8 @@
                         menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
                     }
                 }
+                app.showMenuPanel(menus[useMenu])
+
                 try{
                 let rating = await app.getRating(self.item)
                 if (rating == 0) {
@@ -377,7 +379,6 @@
                 } catch(err) {
 
                 }
-                CiderContextMenu.Create(event, menus[useMenu])
             },
             visibilityChanged: function (isVisible, entry) {
                 this.isVisible = isVisible
diff --git a/src/renderer/views/components/menu-panel.ejs b/src/renderer/views/components/menu-panel.ejs
index 03e852ca..249b8b0f 100644
--- a/src/renderer/views/components/menu-panel.ejs
+++ b/src/renderer/views/components/menu-panel.ejs
@@ -10,10 +10,9 @@
         </div>
         <div class="menu-body">
             <template v-for="item in content.items">
-                <button class="menu-option" @click="action(item)">
+                <button class="menu-option" v-if="canDisplay(item)" @click="action(item)">
                     <div class="sidebar-icon" v-if="item.icon">
                         <div class="svg-icon" :style="{'--url': 'url(' + item.icon + ')'}"></div>
-
                     </div>
                     {{ item.name }}
                 </button>
@@ -38,6 +37,13 @@
 
         },
         methods: {
+            canDisplay(item) {
+                if(!item["disabled"]) {
+                    return true
+                }else{
+                    return false
+                }
+            },
             async getActions() {
                 return this.content.items;
             },
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 42dc5b39..6b804a11 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -326,7 +326,7 @@
                         </div>
                     </div>
                 </div>
-                <div id="app-content">
+                <div id="app-content" @click="menuPanel.visible = false">
                     <div id="navigation-bar">
                         <button class="nav-item" @click="navigateBack()"><%- include('svg/chevron-left.svg') %></button>
                         <button class="nav-item"