2 files changed, 4 insertions, 0 deletions
diff --git a/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss b/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
index 3e7b708557..983463381b 100644
--- a/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
@@ -158,6 +158,8 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co
 
     .#{$primaryStyleName}-sidebar-content {
       padding: 4px 0;
+      overflow-y: auto;
+      overflow-x: hidden;
 
       .gwt-MenuBar {
         .gwt-MenuItem .column-hiding-toggle {
diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_grid.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_grid.scss
index 4a0715b2d2..1552c9591b 100644
--- a/themes/src/main/themes/VAADIN/themes/valo/components/_grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_grid.scss
@@ -228,6 +228,8 @@ $v-grid-details-border-bottom-stripe: $v-grid-cell-horizontal-border !default;
       .#{$primary-stylename}-sidebar-content {
         margin: 0 0 2px;
         padding: 4px 4px 2px;
+        overflow-y: auto;
+        overflow-x: hidden;
       }
     }