diff --git a/src/ChangeLog b/src/ChangeLog
index 8b3ebdc763e..08ac6ceac9a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-14  Sidney Markowitz <sidney@sidney.com>
+
+	* nsmenu.m (EmacsTooltip: setText): set height of tooltip.
+
 2009-06-14  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* nsfont.m (ns_attribute_value): Remove.
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 190bbb37624..aab3016e5e8 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1439,7 +1439,14 @@ - (void) setText: (char *)text
 {
   NSString *str = [NSString stringWithUTF8String: text];
   NSRect r = [textField frame];
-  r.size.width = [[[textField font] screenFont] widthOfString: str] + 8;
+  NSSize textSize = [str sizeWithAttributes: 
+     [NSDictionary dictionaryWithObject: [[textField font] screenFont]
+				 forKey: NSFontAttributeName]];
+  NSSize padSize = [[[textField font] screenFont] 
+		     boundingRectForFont].size;
+ 
+  r.size.width = textSize.width + padSize.width/2;
+  r.size.height = textSize.height + padSize.height/2;
   [textField setFrame: r];
   [textField setStringValue: str];
 }