1 files changed, 12 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index 2f03561c0b..ea8b5e5aa0 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -259,6 +259,18 @@ input::-ms-clear {
 	-webkit-overflow-scrolling: none;
 }
 
+/* "Unnecessary scrollbar" related fixes (#14631, copied from Valo) */
+.v-scrollable.v-panel-content > .v-widget {
+        /* This is needed for IE */
+        vertical-align: middle;
+
+        /* Needed for all browsers. Can't really show anything outside the
+         * scrolling area anyway, so we can safely hide any overflow */
+        overflow: hidden;
+}
+
+
+
 &.v-overlay-container {
 	width: 0;
 	height: 0;