diff --git a/ChangeLog b/ChangeLog
index ab4a44990..f885b6554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-15  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSColorWell.m (-activate:): Deactivate an activate color
+	well when the user closes the color panel.
+
 2011-01-15  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Headers/AppKit/NSColorList.h:
diff --git a/Source/NSColorWell.m b/Source/NSColorWell.m
index 9237d9f07..9f86feb01 100644
--- a/Source/NSColorWell.m
+++ b/Source/NSColorWell.m
@@ -101,6 +101,11 @@ static NSString *GSColorWellDidBecomeExclusiveNotification =
              name: NSColorPanelColorDidChangeNotification
            object: nil];
 
+  [nc addObserver: self
+         selector: @selector(deactivate)
+             name: NSWindowWillCloseNotification
+           object: colorPanel];
+
   _is_active = YES;
 
   [colorPanel setColor: _the_color];