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 aa423ee661..f59c13b857 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
@@ -223,6 +223,12 @@ angular.module("umbraco")
            event.stopPropagation();
         };
 
+        $scope.clickOutsideRow = function() {
+           $scope.currentRow = null;
+           $scope.currentCell = null;
+           $scope.currentControl = null;
+        };
+
         $scope.setWarnighlightRow = function (row) {
             $scope.currentWarnhighlightRow = row;
         };
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 164ae9bdcf..94b61364e6 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
@@ -55,7 +55,8 @@
                         <div class="umb-row"
                              ng-repeat="row in section.rows"
                              ng-click="clickRow(row, $event)"
-                             ng-class="{'-active': currentRow === row}">
+                             ng-class="{'-active': currentRow === row}"
+                             on-outside-click="clickOutsideRow()">
 
                             <div class="umb-row-title-bar">