diff --git a/ChangeLog b/ChangeLog
index 50adcd8d1..edd5286cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-26 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSTextView.m (-updateRuler): Replace last change with one
+	that checks whether the text view is the client view of the ruler
+	and only sets the markers in that case.
+
 2012-01-25 Doug Simons  <doug.simons@testplant.com>
 
 	* Source/NSTextView.m (-updateRuler): Call setClientView: before
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 24609f946..09600a960 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -4577,7 +4577,8 @@ shouldRemoveMarker: (NSRulerMarker *)marker
   /* Update ruler view only if told so */
   if (_tf.uses_ruler && _tf.is_ruler_visible &&
       (sv = [self enclosingScrollView]) != nil && 
-      (rv = [sv horizontalRulerView]) != nil)
+      (rv = [sv horizontalRulerView]) != nil &&
+      [rv clientView] == self)
     {
       NSParagraphStyle *paraStyle;
       NSArray *makers;
@@ -4597,7 +4598,6 @@ shouldRemoveMarker: (NSRulerMarker *)marker
       makers = [_layoutManager rulerMarkersForTextView: self
 			       paragraphStyle: paraStyle
 			       ruler: rv];
-      [rv setClientView:self];
       [rv setMarkers: makers];
     }
 }