diff --git a/ChangeLog b/ChangeLog
index 3cd2a061a..65028a27d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Source/GSTheme.m: Fixes to properly restore previous common images
 	when a theme is deactivated.
+	* Source/NSImage.m: Fix imageNamed to always return proxy.
 
 2009-08-27 Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSImage.m b/Source/NSImage.m
index 8133d744c..e40e94a4d 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -291,7 +291,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
               AUTORELEASE(image);
               image->_flags.archiveByName = YES;
             }
-          return image;
+          image = (NSImage*)[nameDict objectForKey: aName];
         }
     }