diff --git a/editor/js/ui/keyboard.js b/editor/js/ui/keyboard.js
index 07ff5790e..49f660edf 100644
--- a/editor/js/ui/keyboard.js
+++ b/editor/js/ui/keyboard.js
@@ -125,6 +125,7 @@ RED.keyboard = (function() {
                     '<table class="keyboard-shortcuts">'+
                         '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">Space</span></td><td>'+RED._("keyboard.toggleSidebar")+'</td></tr>'+
                         '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">.</span></td><td>'+RED._("keyboard.searchBox")+'</td></tr>'+
+                        '<tr><td><span class="help-key">Ctrl/&#8984;</span> + <span class="help-key">Shift</span> + <span class="help-key">p</span></td><td>'+RED._("keyboard.managePalette")+'</td></tr>'+
                         '<tr><td></td><td></td></tr>'+
                         '<tr><td><span class="help-key">Delete</span></td><td rowspan="2">'+RED._("keyboard.deleteSelected")+'</td></tr>'+
                         '<tr><td><span class="help-key">Backspace</span></td></tr>'+
diff --git a/editor/js/ui/palette-editor.js b/editor/js/ui/palette-editor.js
index 3390e5b8e..e18fc6785 100644
--- a/editor/js/ui/palette-editor.js
+++ b/editor/js/ui/palette-editor.js
@@ -15,6 +15,8 @@
  **/
 RED.palette.editor = (function() {
 
+    var disabled = false;
+
     var editorTabs;
     var filterInput;
     var searchInput;
@@ -259,6 +261,11 @@ RED.palette.editor = (function() {
         if (RED.settings.theme('palette.editable') === false) {
             return;
         }
+        if (disabled) {
+            return;
+        }
+        
+        initInstallTab();
         $("#header-shade").show();
         $("#editor-shade").show();
         $("#sidebar-shade").show();
@@ -379,6 +386,13 @@ RED.palette.editor = (function() {
             return;
         }
 
+        RED.events.on("editor:open",function() { disabled = true; });
+        RED.events.on("editor:close",function() { disabled = false; });
+        RED.events.on("search:open",function() { disabled = true; });
+        RED.events.on("search:close",function() { disabled = false; });
+
+        RED.keyboard.add("*", /* p */ 80,{shift:true,ctrl:true},function() {RED.palette.editor.show();d3.event.preventDefault();});
+
         editorTabs = RED.tabs.create({
             id:"palette-editor-tabs",
             onchange:function(tab) {
@@ -391,7 +405,6 @@ RED.palette.editor = (function() {
                     searchInput.searchBox('value',"");
                 }
                 if (tab.id === 'install') {
-                    initInstallTab();
                     if (searchInput) {
                         searchInput.focus();
                     }
diff --git a/editor/js/ui/search.js b/editor/js/ui/search.js
index 9804418fb..75a649b60 100644
--- a/editor/js/ui/search.js
+++ b/editor/js/ui/search.js
@@ -250,6 +250,7 @@ RED.search = (function() {
                 createDialog();
             }
             dialog.slideDown();
+            RED.events.emit("search:open");
             visible = true;
         }
         searchInput.focus();
@@ -268,6 +269,7 @@ RED.search = (function() {
                     searchInput.searchBox('value','');
                 });
             }
+            RED.events.emit("search:close");
         }
     }
 
diff --git a/red/api/locales/en-US/editor.json b/red/api/locales/en-US/editor.json
index df7bebf85..ab3cf05cd 100644
--- a/red/api/locales/en-US/editor.json
+++ b/red/api/locales/en-US/editor.json
@@ -178,7 +178,8 @@
         "cutNode": "Cut selected nodes",
         "pasteNode": "Paste nodes",
         "undoChange": "Undo the last change performed",
-        "searchBox": "Open search box"
+        "searchBox": "Open search box",
+        "managePalette": "Manage palette"
     },
     "library": {
         "openLibrary": "Open Library...",