diff --git a/src/kits/interface/HaikuControlLook.cpp b/src/kits/interface/HaikuControlLook.cpp
index faa6e2c685..c15f261751 100644
--- a/src/kits/interface/HaikuControlLook.cpp
+++ b/src/kits/interface/HaikuControlLook.cpp
@@ -628,13 +628,13 @@ HaikuControlLook::DrawScrollBarButton(BView* view, BRect rect,
 
 	bool isEnabled = (flags & B_DISABLED) == 0;
 
-	rgb_color buttonColor = isEnabled ? base
-		: tint_color(base, B_LIGHTEN_1_TINT);
+	rgb_color buttonColor = isEnabled ? base : tint_color(base, B_LIGHTEN_1_TINT);
 	DrawButtonBackground(view, rect, updateRect, buttonColor, flags,
 		BControlLook::B_ALL_BORDERS, orientation);
 
 	rect.InsetBy(-1, -1);
-	DrawArrowShape(view, rect, updateRect, text, direction, flags, 1);
+	rgb_color textColor = isEnabled ? text : tint_color(text, B_LIGHTEN_1_TINT);
+	DrawArrowShape(view, rect, updateRect, textColor, direction, flags, 1);
 
 	// revert clipping constraints
 	view->PopState();