diff --git a/Source/GSToolbarView.m b/Source/GSToolbarView.m
index 8148ad7d9..4dab4506e 100644
--- a/Source/GSToolbarView.m
+++ b/Source/GSToolbarView.m
@@ -72,7 +72,7 @@ static NSInteger draggedItemIndex = NSNotFound;
  * Toolbar related code
  */
 
-@interface GSToolbarButton
+@interface GSToolbarButton : NSButton
 - (NSToolbarItem *) toolbarItem;
 @end
 
diff --git a/Source/NSToolbarItem.m b/Source/NSToolbarItem.m
index 2e7e157c3..fde5e4d7b 100644
--- a/Source/NSToolbarItem.m
+++ b/Source/NSToolbarItem.m
@@ -1385,7 +1385,10 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType";
 - (void) setToolTip: (NSString *)toolTip
 {
   ASSIGN(_toolTip, toolTip);
-  [_view setToolTip: _toolTip];
+  if (_view)
+    [_view setToolTip: _toolTip];
+  else if (_backView && [_backView isMemberOfClass:[GSToolbarButton class]])
+    [_backView setToolTip: _toolTip];
 }
 
 - (void) setView: (NSView *)view
@@ -1414,6 +1417,7 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType";
     {
       RELEASE(_backView);
       _backView = [[GSToolbarButton alloc] initWithToolbarItem: self];
+      [_backView setToolTip: _toolTip];
     }
 }