diff --git a/ChangeLog b/ChangeLog
index 5a9b998fc..81663b7a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-26 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSTextFinder.m: Fix Ignore Case option to work.
+	Patch by Doug Simons <doug.simons@testplant.com>
+	* Source/NSControl.m (-initWithCoder:): Don't use NSEnabled flag
+	as it is wrong for NSComboBox.
+	* Source/NSComboBoxCell.m (_loadButtonCell): Set enabled on button cell.
+
 2015-08-25 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Tests/gui/NSView/NSView_autoresize_and_rounding.m: Add tests for
diff --git a/Source/GSTextFinder.m b/Source/GSTextFinder.m
index 085d8ed14..62ca70709 100644
--- a/Source/GSTextFinder.m
+++ b/Source/GSTextFinder.m
@@ -480,6 +480,8 @@ static GSTextFinder *sharedTextFinder;
       if ([ignoreCaseButton state] != NSOffState)
 	{
 	  *options |= NSCaseInsensitiveSearch;
+          // literal search is always case-sensitive, so it must be removed in this case
+	  *options &= ~NSLiteralSearch;
 	}
       else
 	{
diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m
index 9085074d2..fa1c50c5b 100644
--- a/Source/NSComboBoxCell.m
+++ b/Source/NSComboBoxCell.m
@@ -1885,6 +1885,7 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
   [_buttonCell setBordered: YES];
   [_buttonCell setTarget: self];
   [_buttonCell setAction: @selector(_didClickWithinButton:)];
+  [_buttonCell setEnabled: [self isEnabled]];
 }
 
 - (void) _selectCompleted
diff --git a/Source/NSControl.m b/Source/NSControl.m
index efc931753..ba50b87b1 100644
--- a/Source/NSControl.m
+++ b/Source/NSControl.m
@@ -1026,7 +1026,9 @@ static NSNotificationCenter *nc;
         }
       if ([aDecoder containsValueForKey: @"NSEnabled"])
         {
-          [self setEnabled: [aDecoder decodeBoolForKey: @"NSEnabled"]];
+          // Don't use this information as it also comes from the cell
+          // and NSComboBox has always YES here, even when disabled
+          //[self setEnabled: [aDecoder decodeBoolForKey: @"NSEnabled"]];
         }
       if ([aDecoder containsValueForKey: @"NSTag"])
         {