2 files changed, 21 insertions, 9 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss
index 6ca4ab3863..8838e7b4e2 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss
@@ -28,10 +28,6 @@ $v-tree8-border-radius: 3px;
     border: none;
   }
 
-  .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-row-focused:before {
-    display: none;
-  }
-
   .#{$primary-stylename}-cell-content {
     border: $v-grid-cell-focused-border;
     border-color: transparent;
@@ -39,7 +35,11 @@ $v-tree8-border-radius: 3px;
     padding: $v-grid-cell-padding;
   }
 
-  .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-cell-focused
+  .#{$primary-stylename}:focus .#{$primary-stylename}-row-focused:before {
+    display: none;
+  }
+
+  .#{$primary-stylename}:focus .#{$primary-stylename}-cell-focused
     > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content {
     border: $v-grid-cell-focused-border;
   }
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_treegrid.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_treegrid.scss
index 9d06e4a3ef..6317c7b125 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_treegrid.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_treegrid.scss
@@ -67,7 +67,7 @@ $tg-expander-padding: 10px !default;
     display: inline-block;
   }
 
-  .#{$primary-stylename}-rowmode-row-focused {
+  .#{$primary-stylename}-row-focused {
 
     &:before {
       content: "";
@@ -82,14 +82,26 @@ $tg-expander-padding: 10px !default;
     }
   }
 
-  .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-row-focused:before {
+  // Needed for hiding the included style
+  .#{$primary-stylename}-cell-focused {
+    position: static;
+
+    &:before {
+      display: none;
+    }
+  }
+
+  .#{$primary-stylename}:focus .#{$primary-stylename}-row-focused:before {
     display: block;
   }
 
-  .#{$primary-stylename}.v-disabled:focus .#{$primary-stylename}-rowmode-row-focused:before {
-    // Disabled Grid should not show cell focus outline
+  .#{$primary-stylename}.v-disabled:focus .#{$primary-stylename}-row-focused:before {
+    // Disabled TreeGrid should not show row focus outline
     display: none;
   }
 
+  .#{$primary-stylename}:focus .#{$primary-stylename}-cell-focused:before {
+    display: none;
+  }
 }