diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html
deleted file mode 100644
index e13b4b59b5..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="cell-tools-menu"
-    ng-style="overlayMenu.style"
-    on-delayed-mouseleave="closeItemOverlay()">
-     <h5><localize key="grid_insertControl" /></h5>
-
-     <ul class="elements">
-        <li ng-repeat="editor in area.$allowedEditors">
-            <a ng-click="addControl(editor, overlayMenu.area, overlayMenu.$index)" href>
-                <i class="icon {{editor.icon}}"></i>
-                {{editor.name}}</a>
-
-                <pre>{{editor}}</pre>
-        </li>
-     </ul>
-
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index d62a1bf2ca..e11535fec2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -173,38 +173,27 @@ angular.module("umbraco")
         // *********************************************
         // Add items overlay menu
         // *********************************************
-        $scope.overlayMenu = {
-            show: false,
-            style: {},
-            area: undefined,
-            key: undefined
-        };
+       $scope.openEditorOverlay = function(event, area, index, key) {
 
-        $scope.addItemOverlay = function (event, area, index, key) {
-            $scope.overlayMenu.area = area;
-            $scope.overlayMenu.index = index;
-            $scope.overlayMenu.style = {};
-            $scope.overlayMenu.key = key;
+          $scope.editorOverlay = {};
+          $scope.editorOverlay.view = "itempicker";
+          $scope.editorOverlay.title = "Insert editor";
+          $scope.editorOverlay.availableItems = area.$allowedEditors;
+          $scope.editorOverlay.event = event;
+          $scope.editorOverlay.show = true;
 
-            //todo calculate position...
-            var offset = $(event.target).offset();
-            var height = $(window).height();
+          $scope.editorOverlay.chooseItem = function(item) {
+             $scope.addControl(item, area, index);
+             $scope.editorOverlay.show = false;
+             $scope.editorOverlay = null;
+          };
 
-            if ((height - offset.top) < 250) {
-                $scope.overlayMenu.style.bottom = 0;
-                $scope.overlayMenu.style.top = "initial";
-            } else if (offset.top < 300) {
-                $scope.overlayMenu.style.top = 190;
-            }
+          $scope.editorOverlay.close = function(oldModel) {
+             $scope.editorOverlay.show = false;
+             $scope.editorOverlay = null;
+          };
 
-            $scope.overlayMenu.show = true;
-        };
-
-        $scope.closeItemOverlay = function () {
-            $scope.currentControl = null;
-            $scope.overlayMenu.show = false;
-            $scope.overlayMenu.key = undefined;
-        };
+       };
 
         // *********************************************
         // Template management functions
@@ -398,7 +387,7 @@ angular.module("umbraco")
         };
 
         $scope.addControl = function (editor, cell, index, initialize) {
-            $scope.closeItemOverlay();
+
             initialize = (initialize !== false);
 
             var newControl = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index bbe727fa6b..ac72eb8fef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -119,7 +119,7 @@
                                                  ng-repeat="area in row.areas"
                                                  ui-sortable="sortableOptionsCell"
                                                  ng-model="area.controls"
-                                                 ng-click="addItemOverlay($event, area, 0, area.$uniqueId);">
+                                                 ng-click="openEditorOverlay($event, area, 0, area.$uniqueId);">
 
                                                 <div class="umb-cell-content">
 
@@ -287,4 +287,11 @@
         </div>
     </div>
 
+    <umb-overlay
+      ng-if="editorOverlay.show"
+      model="editorOverlay"
+      view="editorOverlay.view"
+      position="target">
+    </umb-overlay>
+
 </div>