diff --git a/ChangeLog b/ChangeLog
index 4b030390..aaf27f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-21 00:20 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Palettes/1Windows/GormNSPanel.m:
+	* Palettes/1Windows/GormNSWindow.m: Added code to prevent
+	redundant release and subsequent crash.
+	
 2004-08-18 00:20 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormClassEditor.m: Cleaned up some code.
diff --git a/Palettes/1Windows/GormNSPanel.m b/Palettes/1Windows/GormNSPanel.m
index 27f613b4..0e99c1a4 100644
--- a/Palettes/1Windows/GormNSPanel.m
+++ b/Palettes/1Windows/GormNSPanel.m
@@ -50,6 +50,7 @@
 		    screen: (NSScreen*)aScreen
 {
   _gormStyleMask = aStyle;
+  [self setReleasedWhenClosed: NO];
   return [super initWithContentRect: contentRect
 		styleMask: NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
 		backing: bufferingType
diff --git a/Palettes/1Windows/GormNSWindow.m b/Palettes/1Windows/GormNSWindow.m
index ecc1e6d7..6be565e6 100644
--- a/Palettes/1Windows/GormNSWindow.m
+++ b/Palettes/1Windows/GormNSWindow.m
@@ -47,6 +47,7 @@
 		    screen: (NSScreen*)aScreen
 {
   _gormStyleMask = aStyle;
+  [self setReleasedWhenClosed: NO];
   return [super initWithContentRect: contentRect
 		styleMask: NSTitledWindowMask | NSClosableWindowMask
 		| NSResizableWindowMask | NSMiniaturizableWindowMask