diff --git a/ChangeLog b/ChangeLog
index 9239f21a6..3700e37aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-07  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSFontPanel.m: Add a tooltip on the character panel button
+
 2011-09-07  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSSpellChecker.m: Use NSLog rather than a popup alert when the spell
diff --git a/Source/NSFontPanel.m b/Source/NSFontPanel.m
index a05afbe8b..a5c057994 100644
--- a/Source/NSFontPanel.m
+++ b/Source/NSFontPanel.m
@@ -730,6 +730,7 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
 
     characterPanelButton = [[NSButton alloc] initWithFrame: characterPanelButtonRect];
     [characterPanelButton setTitle: label];
+    [characterPanelButton setToolTip: _(@"Character Panel")];
     [characterPanelButton setAction: @selector(characterPanel:)];
     [characterPanelButton setTarget: self];
     [bottomArea addSubview: characterPanelButton];