diff --git a/Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h b/Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h
index 774e65c1c..cb79de04f 100644
--- a/Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h
+++ b/Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h
@@ -31,6 +31,7 @@ Following lines are no longer used in this project.
 #define kDelayQuit @"Delay Before Quitting"
 
 #define kResetDelay @"Reset Delay"
+#define kSearchDelay @"Search Delay"
 
 #define kActivationHotKey @"ActivationHotKey"
 #define kHideDockIcon @"Hide Dock Icon"
@@ -76,4 +77,4 @@ Following lines are no longer used in this project.
 #define kQSShowTaskViewerAutomatically @"QSShowTaskViewerAutomatically"
 
 // A boolean indicating whether the task viewer resizes automatically
-#define kQSResizeTaskViewerAutomatically @"QSResizeTaskViewerAutomatically"
+#define kQSResizeTaskViewerAutomatically @"QSResizeTaskViewerAutomatically"
\ No newline at end of file
diff --git a/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h b/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h
index f92c88fae..6e12b2c20 100644
--- a/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h
+++ b/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.h
@@ -30,6 +30,7 @@ typedef NS_ENUM(NSUInteger, QSSearchMode) {
 	BOOL validSearch;
 
 	NSTimer *resetTimer;
+	NSTimer *searchTimer;
 	NSTimer *resultTimer;
 
 	NSTimeInterval lastTime;
diff --git a/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m b/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
index 9711c4a88..36d7b22f5 100644
--- a/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
+++ b/Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
@@ -70,6 +70,7 @@ + (void)initialize {
 - (void)awakeFromNib {
 	[super awakeFromNib];
 	resetTimer = nil;
+	searchTimer = nil;
 	resultTimer = nil;
 	preferredEdge = NSMaxXEdge;
 	partialString = [[NSMutableString alloc] initWithCapacity:1];
@@ -874,6 +875,13 @@ - (void)performSearchFor:(NSString *)string from:(id)sender {
 		[resultController.searchStringField setTextColor:[NSColor redColor]];
 	}
     
+	// Extend Timers
+	if ([searchTimer isValid]) {
+		// NSLog(@"extend");
+		[searchTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:[[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay]]];
+        
+	}
+    
 	if ([resetTimer isValid]) {
 		CGFloat resetDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kResetDelay];
 		if (resetDelay) [resetTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:resetDelay]];
@@ -890,8 +898,19 @@ - (void)resetString {
 
 - (void)partialStringChanged {
 	[self setSearchString:[partialString copy]];
-    	
-	[self performSearch:nil];
+    
+	double searchDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay];
+	
+	// only wait for 'search delay' if we're searching all objects
+	if ([self searchMode] != SearchFilterAll) {
+		[searchTimer invalidate];
+		[self performSearch:nil];
+	} else {
+		if (![searchTimer isValid]) {
+			searchTimer = [NSTimer scheduledTimerWithTimeInterval:searchDelay target:self selector:@selector(performSearch:) userInfo:nil repeats:NO];
+		}
+		[searchTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:searchDelay]];
+	}
 	
 	if (validSearch) {
 		NSColor *color = [[NSUserDefaults standardUserDefaults] colorForKey:@"QSAppearance2T"];
@@ -912,8 +931,11 @@ - (void)partialStringChanged {
 
 - (void)executeCommand:(id)sender {
 	[resultTimer invalidate];
-	[self performSearchFor:partialString from:self];
-	[self display];
+	if ([searchTimer isValid]) {
+		[searchTimer invalidate];
+		[self performSearchFor:partialString from:self];
+		[self display];
+	}
 	[resetTimer fire];
 	[[self controller] executeCommand:self];
 }
@@ -1455,6 +1477,7 @@ - (void)deleteBackward:(id)sender {
 			[self clearTextView];
 			return;
 		}
+		[searchTimer invalidate];
 		// reset the search array
 		[self setSearchArray:nil];
 		if (!partialString || partialString.length <= 1) {
diff --git a/Quicksilver/Nibs/QSSearchPrefPane.xib b/Quicksilver/Nibs/QSSearchPrefPane.xib
index 7eddc4cc4..e195536ec 100644
--- a/Quicksilver/Nibs/QSSearchPrefPane.xib
+++ b/Quicksilver/Nibs/QSSearchPrefPane.xib
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="QSSearchPrefPane">
@@ -14,22 +13,22 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="&lt;&lt; do not localize &gt;&gt;" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="12" userLabel="Search">
+        <window title="&lt;&lt; do not localize &gt;&gt;" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" deferred="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="12" userLabel="Search">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="157" y="15" width="384" height="404"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
             <value key="minSize" type="size" width="384" height="100"/>
             <view key="contentView" id="6">
                 <rect key="frame" x="0.0" y="0.0" width="384" height="404"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="232" customClass="QSHotKeyField">
+                    <textField verticalHuggingPriority="750" id="232" customClass="QSHotKeyField">
                         <rect key="frame" x="94" y="351" width="76" height="19"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" placeholderString="none" drawsBackground="YES" id="275">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
@@ -41,7 +40,7 @@
                             <outlet property="setButton" destination="247" id="249"/>
                         </connections>
                     </textField>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="247">
+                    <button verticalHuggingPriority="750" id="247">
                         <rect key="frame" x="172" y="350" width="29" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="smallSquare" title="Edit" bezelStyle="smallSquare" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="278">
@@ -52,7 +51,7 @@
                             <action selector="set:" target="232" id="248"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="100">
+                    <textField verticalHuggingPriority="750" id="100">
                         <rect key="frame" x="136" y="182" width="54" height="14"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="right" title="0.00s" id="254">
@@ -75,7 +74,7 @@
                             </binding>
                         </connections>
                     </textField>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="104">
+                    <textField verticalHuggingPriority="750" id="104">
                         <rect key="frame" x="18" y="229" width="172" height="14"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Spacebar behavior:" id="256">
@@ -84,7 +83,17 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button toolTip="Automatically put Quicksilver into text mode if no results are found in the Catalog" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="108">
+                    <slider toolTip="Delay before searching to improve performance on slow machines" verticalHuggingPriority="750" id="105">
+                        <rect key="frame" x="194" y="159" width="165" height="16"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                        <sliderCell key="cell" controlSize="mini" continuous="YES" alignment="left" maxValue="0.5" doubleValue="0.5" tickMarkPosition="below" numberOfTickMarks="5" sliderType="linear" id="257">
+                            <font key="font" size="12" name="Helvetica"/>
+                        </sliderCell>
+                        <connections>
+                            <binding destination="187" name="value" keyPath="values.Search Delay" id="189"/>
+                        </connections>
+                    </slider>
+                    <button toolTip="Automatically put Quicksilver into text mode if no results are found in the Catalog" id="108">
                         <rect key="frame" x="18" y="202" width="335" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Switch to text mode if no match is found" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="259">
@@ -95,7 +104,7 @@
                             <binding destination="187" name="value" keyPath="values.QSTransformBadSearchToText" id="195"/>
                         </connections>
                     </button>
-                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="109">
+                    <button id="109">
                         <rect key="frame" x="18" y="181" width="22" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="260">
@@ -106,7 +115,7 @@
                             <binding destination="187" name="value" keyPath="values.Reset Delay" id="194"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="116">
+                    <textField verticalHuggingPriority="750" id="116">
                         <rect key="frame" x="37" y="182" width="119" height="13"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Reset search after:" id="262">
@@ -115,7 +124,30 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <slider toolTip="Time to wait before new letters typed are considered a new search" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="122">
+                    <textField verticalHuggingPriority="750" id="120">
+                        <rect key="frame" x="136" y="160" width="54" height="14"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="right" title="0.00s" id="264">
+                            <numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="0.00s" negativeFormat="-0.00" localizesFormat="NO" hasThousandSeparators="NO" thousandSeparator="," id="115">
+                                <attributedString key="attributedStringForZero">
+                                    <fragment content="0.00s"/>
+                                </attributedString>
+                                <decimal key="minimum" value="NaN"/>
+                                <decimal key="maximum" value="NaN"/>
+                            </numberFormatter>
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="187" name="value" keyPath="values.Search Delay" id="190">
+                                <dictionary key="options">
+                                    <bool key="NSConditionallySetsEditable" value="NO"/>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
+                    <slider toolTip="Time to wait before new letters typed are considered a new search" verticalHuggingPriority="750" id="122">
                         <rect key="frame" x="194" y="180" width="165" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <sliderCell key="cell" controlSize="mini" continuous="YES" alignment="left" minValue="0.5" maxValue="3" doubleValue="3" tickMarkPosition="below" numberOfTickMarks="6" sliderType="linear" id="266">
@@ -126,7 +158,16 @@
                             <binding destination="187" name="enabled" keyPath="values.Reset Delay" id="192"/>
                         </connections>
                     </slider>
-                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="129">
+                    <textField verticalHuggingPriority="750" id="123">
+                        <rect key="frame" x="37" y="160" width="119" height="13"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Wait before searching:" id="267">
+                            <font key="font" metaFont="label"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <popUpButton verticalHuggingPriority="750" id="129">
                         <rect key="frame" x="184" y="225" width="178" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="269">
@@ -162,7 +203,7 @@
                             <binding destination="187" name="selectedTag" keyPath="values.QSSearchSpaceBarBehavior" id="197"/>
                         </connections>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="157">
+                    <textField verticalHuggingPriority="750" id="157">
                         <rect key="frame" x="17" y="353" width="71" height="14"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Shortcut:" id="270">
@@ -171,7 +212,7 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="161">
+                    <popUpButton verticalHuggingPriority="750" id="161">
                         <rect key="frame" x="266" y="303" width="96" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <popUpButtonCell key="cell" type="push" title="Command" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="20" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="171" id="271">
@@ -208,7 +249,7 @@
                             <binding destination="187" name="selectedTag" keyPath="values.QSModifierActivationKey" id="205"/>
                         </connections>
                     </popUpButton>
-                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="170">
+                    <popUpButton verticalHuggingPriority="750" id="170">
                         <rect key="frame" x="184" y="303" width="83" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <popUpButtonCell key="cell" type="push" title="Double" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="2" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="156" id="272">
@@ -233,11 +274,21 @@
                             <binding destination="187" name="selectedTag" keyPath="values.QSModifierActivationCount" id="323"/>
                         </connections>
                     </popUpButton>
-                    <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="185">
+                    <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="185">
                         <rect key="frame" x="19" y="270" width="344" height="5"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                        <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                        <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <font key="titleFont" metaFont="system"/>
                     </box>
-                    <button toolTip="Use a single key command to activate" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="227">
+                    <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="367">
+                        <rect key="frame" x="19" y="142" width="344" height="5"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                        <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                        <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <font key="titleFont" metaFont="system"/>
+                    </box>
+                    <button toolTip="Use a single key command to activate" id="227">
                         <rect key="frame" x="17" y="306" width="172" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Modifier-only activation" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="274">
@@ -248,7 +299,7 @@
                             <binding destination="187" name="value" keyPath="values.QSModifierActivationCount" id="229"/>
                         </connections>
                     </button>
-                    <button toolTip="Use a single key command to activate" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="373">
+                    <button toolTip="Use a single key command to activate" id="373">
                         <rect key="frame" x="17" y="285" width="211" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="When activated, switch keyboard to" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="374">
@@ -259,7 +310,7 @@
                             <binding destination="187" name="value" keyPath="values.QSSwitchKeyboardOnActivation" id="382"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="294">
+                    <textField verticalHuggingPriority="750" id="294">
                         <rect key="frame" x="30" y="328" width="337" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Enter the hotkey you want to use to display Quicksilver" id="295">
@@ -268,7 +319,7 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="324">
+                    <textField verticalHuggingPriority="750" id="324">
                         <rect key="frame" x="17" y="378" width="139" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Activation" id="325">
@@ -277,7 +328,7 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="326">
+                    <textField verticalHuggingPriority="750" id="326">
                         <rect key="frame" x="17" y="247" width="130" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Search" id="327">
@@ -286,16 +337,16 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="328">
-                        <rect key="frame" x="203" y="55" width="19" height="28"/>
+                    <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="328">
+                        <rect key="frame" x="203" y="44" width="19" height="28"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <stepperCell key="cell" alignment="left" increment="8" minValue="18" maxValue="50" doubleValue="18" autorepeat="NO" id="345"/>
                         <connections>
                             <binding destination="187" name="value" keyPath="values.QSResultViewRowHeight" id="347"/>
                         </connections>
                     </stepper>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="329">
-                        <rect key="frame" x="17" y="56" width="130" height="20"/>
+                    <textField verticalHuggingPriority="750" id="329">
+                        <rect key="frame" x="17" y="45" width="130" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Results Row Height:" id="344">
                             <font key="font" metaFont="smallSystem"/>
@@ -303,8 +354,8 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField toolTip="Sets the height of each row in the results window" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="330">
-                        <rect key="frame" x="162" y="58" width="36" height="22"/>
+                    <textField toolTip="Sets the height of each row in the results window" verticalHuggingPriority="750" id="330">
+                        <rect key="frame" x="162" y="47" width="36" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="343">
                             <font key="font" metaFont="system"/>
@@ -315,8 +366,8 @@
                             <binding destination="187" name="value" keyPath="values.QSResultViewRowHeight" id="348"/>
                         </connections>
                     </textField>
-                    <popUpButton toolTip="Set when the results window appears for search results" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="331">
-                        <rect key="frame" x="156" y="29" width="163" height="22"/>
+                    <popUpButton toolTip="Set when the results window appears for search results" verticalHuggingPriority="750" id="331">
+                        <rect key="frame" x="156" y="18" width="163" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <popUpButtonCell key="cell" type="push" title="Manually" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" tag="-1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="341" id="338">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -333,8 +384,8 @@
                             <binding destination="187" name="selectedTag" keyPath="values.Result Window Behavior" id="346"/>
                         </connections>
                     </popUpButton>
-                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="332">
-                        <rect key="frame" x="17" y="31" width="139" height="17"/>
+                    <textField verticalHuggingPriority="750" id="332">
+                        <rect key="frame" x="17" y="20" width="139" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Show other results:" id="337">
                             <font key="font" metaFont="smallSystem"/>
@@ -342,8 +393,8 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="350">
-                        <rect key="frame" x="17" y="106" width="316" height="18"/>
+                    <button id="350">
+                        <rect key="frame" x="17" y="95" width="316" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Focus action when displaying results" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="351">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -353,8 +404,8 @@
                             <binding destination="187" name="value" keyPath="values.QSJumpToActionOnResult" id="352"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="365">
-                        <rect key="frame" x="17" y="130" width="208" height="17"/>
+                    <textField verticalHuggingPriority="750" id="365">
+                        <rect key="frame" x="17" y="119" width="208" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Results" id="366">
                             <font key="font" metaFont="system"/>
@@ -362,8 +413,8 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button toolTip="Split the results list into two columns to display the children of results" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="368">
-                        <rect key="frame" x="17" y="86" width="316" height="18"/>
+                    <button toolTip="Split the results list into two columns to display the children of results" id="368">
+                        <rect key="frame" x="17" y="75" width="316" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Show children in result list" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="371">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -378,7 +429,7 @@
                             </connections>
                         </buttonCell>
                     </button>
-                    <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="376">
+                    <popUpButton verticalHuggingPriority="750" id="376">
                         <rect key="frame" x="231" y="282" width="131" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="379" id="377">
@@ -397,13 +448,8 @@
                             <binding destination="187" name="enabled" keyPath="values.QSSwitchKeyboardOnActivation" id="387"/>
                         </connections>
                     </popUpButton>
-                    <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="367">
-                        <rect key="frame" x="19" y="155" width="344" height="5"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                    </box>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="132" y="147"/>
         </window>
         <userDefaultsController representsSharedInstance="YES" id="187" userLabel="Shared Defaults"/>
         <customObject id="209" userLabel="Shared App" customClass="NSApplication"/>
diff --git a/Quicksilver/Resources/QSDefaults.plist b/Quicksilver/Resources/QSDefaults.plist
index 4e6eb6e88..e522a4fb4 100644
--- a/Quicksilver/Resources/QSDefaults.plist
+++ b/Quicksilver/Resources/QSDefaults.plist
@@ -67,6 +67,8 @@
 	<false/>
 	<key>Result Window Behavior</key>
 	<integer>1</integer>
+	<key>Search Delay</key>
+	<real>0.05</real>
 	<key>Show Release Notes on Upgrade</key>
 	<true/>
 	<key>Use Effects</key>