diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 17b1257ca1..0918d553df 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -213,6 +213,8 @@ function hideMarketplace() {
 // }
 
 var TOOLS_PATH = Script.resolvePath("assets/images/tools/");
+var GRABBABLE_ENTITIES_MENU_CATEGORY = "Edit";
+var GRABBABLE_ENTITIES_MENU_ITEM = "Create Entities As Grabbable";
 
 var toolBar = (function () {
     var EDIT_SETTING = "io.highfidelity.isEditting"; // for communication with other scripts
@@ -222,21 +224,6 @@ var toolBar = (function () {
         systemToolbar = null,
         tablet = null;
 
-    // add a menu item for setting newly created entities as grabbable
-    var GRABBABLE_ENTITIES_MENU_CATEGORY = "Developer";
-    var GRABBABLE_ENTITIES_MENU_ITEM = "Create Entities As Grabbable";
-
-    if (Menu.menuExists(GRABBABLE_ENTITIES_MENU_CATEGORY) &&
-        !Menu.menuItemExists(GRABBABLE_ENTITIES_MENU_CATEGORY, GRABBABLE_ENTITIES_MENU_ITEM)) {
-        Menu.addMenuItem({
-            menuName: GRABBABLE_ENTITIES_MENU_CATEGORY,
-            menuItemName: GRABBABLE_ENTITIES_MENU_ITEM,
-            isCheckable: true,
-            isChecked: true,
-            grouping: "Advanced"
-        });
-    }
-
     function createNewEntity(properties) {
         var dimensions = properties.dimensions ? properties.dimensions : DEFAULT_DIMENSIONS;
         var position = getPositionToCreateEntity();
@@ -922,11 +909,21 @@ function setupModelMenus() {
         afterItem: "Parent Entity to Last",
         grouping: "Advanced"
     });
+
+    Menu.addMenuItem({
+        menuName: GRABBABLE_ENTITIES_MENU_CATEGORY,
+        menuItemName: GRABBABLE_ENTITIES_MENU_ITEM,
+        afterItem: "Unparent Entity",
+        isCheckable: true,
+        isChecked: true,
+        grouping: "Advanced"
+    });
+
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Allow Selecting of Large Models",
         shortcutKey: "CTRL+META+L",
-        afterItem: "Unparent Entity",
+        afterItem: GRABBABLE_ENTITIES_MENU_ITEM,
         isCheckable: true,
         isChecked: true,
         grouping: "Advanced"