diff --git a/ChangeLog b/ChangeLog
index 093827c63..a647d3d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-28  Marcian Lytwyn <marcian.lytwyn@advcsi.com>
+
+	* ColorPickers/GSNamedColorPicker.m
+	  GSNamedColorPicker needs to conform to NSTtextFieldDelegate
+	* ColorPickers/GSStandardColorPicker.h
+	  GSStandardCSColorPicker needs to conform to NSTextFieldDelegate
+
 2012-06-27  Marcian Lytwyn <marcian.lytwyn@advcsi.com>
 
 	* Source/NSWindow.m - Fix [NSWindow screen] method according
@@ -17,7 +24,7 @@
 	* Source/NSSavePanel.m - Qualify delegate method(s) with
 	  id<NSOpenSavePanelDelegate>
 	
-	*** NSOpenSavePanelDelegate ***
+	*** NSControlTextEditingDelegate ***
 	* Headers/AppKit/NSControl.h - Added NSControlTextEditingDelegate
 	  protocol definition
 	* Headers/AppKit/NSTextField.h - Added NSTextFieldDelegate
diff --git a/ColorPickers/GSNamedColorPicker.m b/ColorPickers/GSNamedColorPicker.m
index 41b475fb0..b652409a1 100644
--- a/ColorPickers/GSNamedColorPicker.m
+++ b/ColorPickers/GSNamedColorPicker.m
@@ -27,7 +27,7 @@
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
 
-@interface GSNamedColorPicker: NSColorPicker <NSColorPickingCustom>
+@interface GSNamedColorPicker: NSColorPicker <NSColorPickingCustom, NSTextFieldDelegate>
 {
   NSView *baseView;
   NSComboBox *cb;
diff --git a/ColorPickers/GSStandardColorPicker.h b/ColorPickers/GSStandardColorPicker.h
index 196949469..5ff1a51e7 100644
--- a/ColorPickers/GSStandardColorPicker.h
+++ b/ColorPickers/GSStandardColorPicker.h
@@ -35,6 +35,8 @@
 @class GSTable, NSSlider, NSTextField;
 @class NSBox, NSButtonCell, NSMatrix;
 
+@protocol NSTextFieldDelegate;
+
 @interface GSStandardColorPicker: NSColorPicker <NSColorPickingCustom>
 {
   GSTable *baseView;
@@ -50,7 +52,7 @@
 
 @end
 
-@interface GSStandardCSColorPicker: NSColorPicker <NSColorPickingCustom>
+@interface GSStandardCSColorPicker: NSColorPicker <NSColorPickingCustom, NSTextFieldDelegate>
 {
   GSTable *baseView;;