diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
index d60535acd1..396d89474b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
@@ -30,11 +30,16 @@ angular.module("umbraco")
                 }
             }
         }
-
-
-        $scope.styles = _.filter( angular.copy($scope.dialogOptions.config.items.styles), function(item){return (item.applyTo === undefined || item.applyTo === $scope.dialogOptions.itemType); });
-        $scope.config = _.filter( angular.copy($scope.dialogOptions.config.items.config), function(item){return (item.applyTo === undefined || item.applyTo === $scope.dialogOptions.itemType); });
-
+        
+        // if opening a settings dialog from a control - use only settings from this control
+        // otherwise use editor configuration for row/cell settings
+        if ($scope.dialogOptions.itemType === 'control') {
+            $scope.config = $scope.dialogOptions.gridItem.editor.config.settings;
+            $scope.styles = null;
+        } else {
+            $scope.styles = _.filter(angular.copy($scope.dialogOptions.config.items.styles), function (item) { return (item.applyTo === undefined || item.applyTo === $scope.dialogOptions.itemType); });
+            $scope.config = _.filter(angular.copy($scope.dialogOptions.config.items.config), function (item) { return (item.applyTo === undefined || item.applyTo === $scope.dialogOptions.itemType); });
+        }
 
         var element = $scope.dialogOptions.gridItem;
         if(angular.isObject(element.config)){
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 87652c6aa2..7c01df416b 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
@@ -307,28 +307,6 @@ 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 546f897a43..15d921b10c 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
@@ -173,7 +173,7 @@
                                                         <!-- 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)"
+                                                               ng-click="editGridItemSettings(control, 'control')"
                                                                href>
                                                                 <i class="icon icon-hammer"></i>
                                                             </a>