diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
index a2ee0ae953..8f4084f58b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less
@@ -125,6 +125,11 @@
 }
 
 
+/*.usky-grid .selectedRow {
+     border: 1px solid rgba(182, 182, 182, 0.3);
+}*/
+
+
 
 
 // CELL
@@ -219,13 +224,14 @@
 }
 
 .usky-grid  .usky-control:hover{
-     border: 1px dashed rgba(182, 182, 182, 0.3);
+    /*border: 1px solid rgba(182, 182, 182, 0.3);*/
     border-bottom: 2px solid rgba(182, 182, 182, 0.3);
 
 }
 
 .usky-grid  .usky-control-placeholder:hover{
-     border-bottom:2px solid rgba(182, 182, 182, 0.0) !important;
+    /*border: 1px solid rgba(182, 182, 182, 0);*/
+    border-bottom:2px solid rgba(182, 182, 182, 0.0) !important;
 }
 
 .usky-grid .removingControl{
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 5b08329eac..df14dce8b7 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
@@ -23,12 +23,12 @@ angular.module("umbraco")
             start: function (e, ui) {
                 ui.item.find('.mceNoEditor').each(function () {
                     tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
-
                 });
             },
 
             stop: function (e, ui) {
-                ui.item.find('.mceNoEditor').each(function () {
+                ui.item.parents(".usky-column").find('.mceNoEditor').each(function () {
+                    tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
                     tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
                 });
             }
@@ -109,10 +109,10 @@ angular.module("umbraco")
             },
 
             stop: function (e, ui) {
-                ui.item.parents(".usky-cell").find('.mceNoEditor').each(function () {
-                    tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
-                    tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
-                });
+                //ui.item.parents(".usky-cell").find('.mceNoEditor').each(function () {
+                //    tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
+                //    tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
+                //});
             }
         }
 
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 bcb89a51e2..deb1b0c04a 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
@@ -43,7 +43,7 @@
                          class="usky-row"
                          ng-mouseover="setCurrentRow(row)"
                          ng-mouseleave="disableCurrentRow()"
-                         ng-class="{removingControl:currentRemoveControl == row, movingControl:currentMovedRow == row}">
+                         ng-class="{removingControl:currentRemoveControl == row, movingControl:currentMovedRow == row, selectedRow:currentRow == row && currentControl === null}">
 
                         <!-- Row tool -->
                         <div class="row-tools" ng-animate="'fade'"