diff --git a/src/eepp/ui/uiscrollbar.cpp b/src/eepp/ui/uiscrollbar.cpp
index f36e1aaf0..f4e8ce324 100644
--- a/src/eepp/ui/uiscrollbar.cpp
+++ b/src/eepp/ui/uiscrollbar.cpp
@@ -104,6 +104,20 @@ void UIScrollBar::onAutoSize() {
 				setSize( mSize.getWidth(), size.getHeight() );
 			}
 		}
+	} else if ( NULL != mSlider->getSliderButton() ) {
+		UISkin * tSkin = mSlider->getSliderButton()->getSkin();
+
+		if ( NULL != tSkin ) {
+			Sizei size = tSkin->getSize();
+
+			if ( mFlags & UI_AUTO_SIZE ) {
+				if ( mSlider->isVertical() ) {
+					setSize( size.getWidth(), mSize.getHeight() );
+				} else {
+					setSize( mSize.getWidth(), size.getHeight() );
+				}
+			}
+		}
 	}
 }