diff --git a/ChangeLog b/ChangeLog
index b25117f49..83a6e7c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-21 08:33 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibTemplates.m: in GSWindowTemplate initWithCoder:, 
+	temporarily retain, then release (after setting back into the window)
+	the content view to prevent it from being inadvertantly deallocated.
+
 2005-07-17  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSApplication.m (gnustep_backend_path,
diff --git a/Source/GSNibTemplates.m b/Source/GSNibTemplates.m
index 1a4b97aa4..7b2b8fa0f 100644
--- a/Source/GSNibTemplates.m
+++ b/Source/GSNibTemplates.m
@@ -840,6 +840,7 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
 
 	      // if we are not in an interface builder, call 
 	      // designated initializer per spec...
+	      RETAIN(contentView); // prevent view from being deallocated.
 	      obj = [obj initWithContentRect: [contentView frame]
 			 styleMask: [obj styleMask]
 			 backing: [obj backingType]
@@ -847,6 +848,7 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
 	      
 	      // set the content view back
 	      [obj setContentView: contentView];
+	      RELEASE(contentView); // release view.
 	    }
 
 	  // autoposition window