diff --git a/AppKit/_CPImageAndTextView.j b/AppKit/_CPImageAndTextView.j
index c21db7c2c..d5755c60d 100644
--- a/AppKit/_CPImageAndTextView.j
+++ b/AppKit/_CPImageAndTextView.j
@@ -285,13 +285,28 @@ var HORIZONTAL_MARGIN   = 3.0,
 {
     if (_image == anImage)
         return;
-    
+
+    if ([_image delegate] === self)
+        [_image setDelegate:nil];
+
     _image = anImage;
     _flags |= _CPImageAndTextViewImageChangedFlag;
-    
+
+    if ([_image loadStatus] !== CPImageLoadStatusCompleted)
+        [_image setDelegate:self];
+
     [self setNeedsLayout];
 }
 
+- (void)imageDidLoad:(id)anImage
+{
+    if (anImage === _image)
+    {
+        _flags |= _CPImageAndTextViewImageChangedFlag;
+        [self setNeedsLayout];
+    }
+}
+
 - (CPImage)image
 {
     return _image;