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 24aa722cc3..87652c6aa2 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
@@ -306,6 +306,28 @@ angular.module("umbraco")
                 });
 
         };
+        
+        
+        // *********************************************
+        // Control management functions
+        // *********************************************
+
+        $scope.editControlSettings = function (control) {
+
+            var obj = $scope.model.config;
+            obj.items.config = control.editor.config.settings;
+
+            dialogService.open(
+            {
+                template: "views/propertyeditors/grid/dialogs/config.html",
+                gridItem: { "config": (control.value ? control.value.settings : null) },
+                itemType: null,
+                config: obj,
+                callback: function (data) {
+                    control.settings = data.config;
+                }
+            });
+        };
 
         // *********************************************
         // Area management functions
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 05809cad02..546f897a43 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
@@ -169,6 +169,15 @@
                                                                 <i class="icon icon-settings" title="@grid_settings" localize="title"></i>
                                                             </a>
                                                         </div>
+                                                        
+                                                        <!-- control setting area -->
+                                                        <div class="cell-tools-edit" ng-style="hasSettings && $first && {'top': '99px'}" ng-if="control.editor.config && control.editor.config.settings">
+                                                            <a class="iconBox"
+                                                               ng-click="editControlSettings(control)"
+                                                               href>
+                                                                <i class="icon icon-hammer"></i>
+                                                            </a>
+                                                        </div>
 
                                                     </div>
 
@@ -261,4 +270,4 @@
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>