diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index c85ab9822..f259a2633 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -334,6 +334,7 @@ static Class rulerViewClass = nil;
     }
 
   [_contentView scrollToPoint: point];
+  [window update];
 }
 
 - (void) reflectScrolledClipView: (NSClipView*)aClipView
diff --git a/Source/NSScroller.m b/Source/NSScroller.m
index 25af7bf1b..a9b8525a2 100644
--- a/Source/NSScroller.m
+++ b/Source/NSScroller.m
@@ -704,9 +704,9 @@ static BOOL preCalcValues = NO;
 
   [self drawKnobSlot];
   [self drawKnob];
+
   [self drawArrow: NSScrollerDecrementArrow highlight: NO];
   [self drawArrow: NSScrollerIncrementArrow highlight: NO];
-
 }
 
 - (void) drawArrow: (NSScrollerArrow)whichButton highlight: (BOOL)flag
@@ -825,8 +825,11 @@ static BOOL preCalcValues = NO;
 		0 : 2 * (buttonsWidth + buttonsDistance));
 	  height = knobHeight;
 	  width = buttonsWidth;
+#if 0
 	  if (_isHorizontal)	// keeps horiz knob off of the buttons
 	    y++;
+#endif
+	  x = buttonsDistance;
 	  break;
 	}
 
@@ -865,6 +868,7 @@ static BOOL preCalcValues = NO;
 	  return NSZeroRect;
 	width = buttonsWidth;
 	height = buttonsWidth;
+	x = buttonsDistance;
 	break;
 
       case NSScrollerIncrementLine:
@@ -883,6 +887,7 @@ static BOOL preCalcValues = NO;
 	  return NSZeroRect;
 	height = buttonsWidth;
 	width = buttonsWidth;
+	x = buttonsDistance;
 	break;
 
       case NSScrollerNoPart: