diff --git a/ChangeLog b/ChangeLog
index 252228ee..bb3041f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-14 09:03 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormCore/GormDocument.m: Implement toolbarSelectableItemIdentifiers
+	in the toolbar delegate so that the items will remain selected showing
+	the current selection. 
+
 2005-07-14 00:05 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormCore/GormInspectorsManager.m: Removed commented out
diff --git a/GormCore/GormDocument.m b/GormCore/GormDocument.m
index 5105e0b3..530dce47 100644
--- a/GormCore/GormDocument.m
+++ b/GormCore/GormDocument.m
@@ -4268,4 +4268,14 @@ willBeInsertedIntoToolbar: (BOOL)flag
 		  @"FileItem",
 		  nil];
 }
+
+- (NSArray*) toolbarSelectableItemIdentifiers: (NSToolbar*)toolbar
+{ 
+  return [NSArray arrayWithObjects: @"ObjectsItem", 
+		  @"ImagesItem", 
+		  @"SoundsItem", 
+		  @"ClassesItem", 
+		  @"FileItem",
+		  nil];
+}
 @end