diff --git a/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java b/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java
index 234f9d607255..5e902b7d50eb 100644
--- a/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java
+++ b/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java
@@ -71,7 +71,7 @@ class DefaultScrollBarUI extends ScrollBarUI {
   private int myOldValue;
 
   DefaultScrollBarUI() {
-    this(13, 14, 10);
+    this(Registry.is("ide.scroll.thumb.small.if.opaque") ? 13 : 10, 14, 10);
   }
 
   DefaultScrollBarUI(int thickness, int thicknessMax, int thicknessMin) {
@@ -127,7 +127,7 @@ class DefaultScrollBarUI extends ScrollBarUI {
 
   void paintThumb(Graphics2D g, int x, int y, int width, int height, JComponent c) {
     RegionPainter<Float> p = ScrollColorProducer.isDark(c) ? ScrollPainter.Thumb.DARCULA : ScrollPainter.Thumb.DEFAULT;
-    paint(p, g, x, y, width, height, c, myThumbAnimator.myValue, true);
+    paint(p, g, x, y, width, height, c, myThumbAnimator.myValue, Registry.is("ide.scroll.thumb.small.if.opaque"));
   }
 
   void onThumbMove() {
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 0d32494c502b..5269c4c53441 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -133,6 +133,9 @@ ide.scroll.background.auto.description=Use background color of a view to paint v
 ide.scroll.layout.header.over.corner=true
 ide.scroll.layout.header.over.corner.description=Expand a scroll pane header if a scroll bar is opaque.
 
+ide.scroll.thumb.small.if.opaque=false
+ide.scroll.thumb.small.if.opaque.description=Allows to tune an opaque thumb thickness. Affects Windows and Linux only.
+
 mac.scroll.thumb.darcula.color=166
 mac.scroll.thumb.darcula.color.description=Allows to tune a thumb color in the editor component.