diff --git a/ChangeLog b/ChangeLog
index bd240dd72..cabea3cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-15  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSComboBoxCell.m (-runLoopWithComboBoxCell:): Dismiss
+	the combo box's list without changing the selection when the user
+	presses Escape.
+
 2010-08-13 Riccardo Mottola
 
 	* Source/NSMatrix.m
diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m
index a70f36bde..6d30aac3c 100644
--- a/Source/NSComboBoxCell.m
+++ b/Source/NSComboBoxCell.m
@@ -465,6 +465,10 @@ static GSComboWindow *gsWindow = nil;
             {
               [self validateSelection];
             }
+	  else if (key == 0x001b)
+	    {
+	      break;
+	    }
           else
             {
 	      [NSApp sendEvent: event];