diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 461dc49d25..4ef523167c 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -167,6 +167,7 @@
 
     var entityListTool = new EntityListTool(shouldUseEditTabletApp, selectionManager);
     entityListTool.createApp = createApp;
+    entityListTool.grid = grid;
     entityListTool.cameraManager = cameraManager;
     entityListTool.selectionDisplay = selectionDisplay;
 
diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js
index 897604b5b3..b5e8e59ed7 100644
--- a/scripts/system/create/entityList/entityList.js
+++ b/scripts/system/create/entityList/entityList.js
@@ -217,7 +217,8 @@ var EntityListTool = function(shouldUseEditTabletApp, selectionManager) {
                         HMD.homeButtonID,
                         HMD.homeButtonHighlightID,
                         HMD.miniTabletID,
-                        HMD.miniTabletScreenID
+                        HMD.miniTabletScreenID,
+                        that.grid.getGridEntityToolID()
                     ];
                     var seltoolsIds = SelectionDisplay.toolEntityMaterial.concat(
                         SelectionDisplay.allToolEntities,