diff --git a/ChangeLog b/ChangeLog
index 99bd29762..b310127aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-05  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSWindowController.m (-setWindow:): Clear the window
+	delegate if set by NIB loading.
+
 2014-01-31  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/AppKit.h: Add a few missing classes.
diff --git a/Source/NSWindowController.m b/Source/NSWindowController.m
index cd727204c..c70de43b7 100644
--- a/Source/NSWindowController.m
+++ b/Source/NSWindowController.m
@@ -355,6 +355,12 @@
         }
       [responder setNextResponder: [self nextResponder]];
       [_window setWindowController: nil];
+
+      // Remove the delegate as well if set to the owner in the NIB file
+      if ([_window delegate] == _owner)
+        {
+          [_window setDelegate: nil];
+        }
     }
 
   ASSIGN(_window, aWindow);