diff --git a/ChangeLog b/ChangeLog
index f83e4e6b8..ca5193307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-04 Enrico Sersale <enrico@fibernet.ro>
+
+	* Source/NSView.m: In -setToolTip: sets the has_tooltips flag.
+
 2006-10-04 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSWindow.m: Add help key support for context help.
diff --git a/Source/NSView.m b/Source/NSView.m
index 09bb3cf98..770f6349d 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -4353,6 +4353,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
 {
   GSToolTips	*tt = [GSToolTips tipsForView: self];
 
+  _rFlags.has_tooltips = 1;
   [tt setToolTip: string];
 }