diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index d0236ce993..688fabab8b 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -849,7 +849,6 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Parent Entity to Last",
-        shortcutKey: "CTRL+P",
         afterItem: "Entity List...",
         grouping: "Advanced"
     });
@@ -858,7 +857,6 @@ function setupModelMenus() {
         menuName: "Edit",
         menuItemName: "Unparent Entity",
         afterItem: "Entity List...",
-        shortcutKey: "CTRL+SHIFT+P",
         grouping: "Advanced"
     });
     Menu.addMenuItem({
@@ -1374,6 +1372,12 @@ var keyReleaseEvent = function (event) {
             });
             grid.setPosition(newPosition);
         }
+    } else if (event.text === 'p' && event.isControl && !event.isAutoRepeat ) {
+        if (event.isShifted) {
+            unparentSelectedEntities();
+        } else {
+            parentSelectedEntities();
+        }
     }
 };
 Controller.keyReleaseEvent.connect(keyReleaseEvent);