diff --git a/ChangeLog b/ChangeLog
index ca003c199..bc180b3fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-20 12:08-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSToolbarCustomizationPalette.m: Look up default items before
+	calling the delegate like in NSToolbar.m.   This was causing an
+	exception which prevented the panel from showing.
+
 2009-02-18 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSServicesManager.m: Clean up update of services menu,
diff --git a/Source/GSToolbarCustomizationPalette.m b/Source/GSToolbarCustomizationPalette.m
index a37fbed52..7f5950616 100644
--- a/Source/GSToolbarCustomizationPalette.m
+++ b/Source/GSToolbarCustomizationPalette.m
@@ -254,18 +254,28 @@
   e = [itemIdentifiers objectEnumerator];
   while ((identifier = [e nextObject]) != nil)
     {
-      [_allowedItems addObject: [delegate toolbar: toolbar 
-                            itemForItemIdentifier: identifier
-                        willBeInsertedIntoToolbar: NO]];
+      NSToolbarItem *item = [toolbar _toolbarItemForIdentifier: identifier];      
+      if(item == nil)
+	{
+	  item = [delegate toolbar: toolbar 
+			   itemForItemIdentifier: identifier
+			   willBeInsertedIntoToolbar: NO];
+	}  
+      [_allowedItems addObject: item]; 
     }
 
   itemIdentifiers = [delegate toolbarDefaultItemIdentifiers: toolbar];
   e = [itemIdentifiers objectEnumerator];
   while ((identifier = [e nextObject]) != nil)
     {
-      [_defaultItems addObject: [delegate toolbar: toolbar 
-                            itemForItemIdentifier: identifier
-                        willBeInsertedIntoToolbar: NO]];
+      NSToolbarItem *item = [toolbar _toolbarItemForIdentifier: identifier];      
+      if(item == nil)
+	{
+	  item = [delegate toolbar: toolbar 
+			   itemForItemIdentifier: identifier
+			   willBeInsertedIntoToolbar: NO];
+	}  
+      [_defaultItems addObject: item];
     }
 
   [_customizationView setToolbarItems: _allowedItems];