diff --git a/Limelight/MainFrameViewController.h b/Limelight/MainFrameViewController.h
index c178a73..d4777f9 100644
--- a/Limelight/MainFrameViewController.h
+++ b/Limelight/MainFrameViewController.h
@@ -11,7 +11,7 @@
 #import "PairManager.h"
 #import "StreamConfiguration.h"
 
-@interface MainFrameViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate, MDNSCallback, NSURLConnectionDelegate, PairCallback>
+@interface MainFrameViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate, MDNSCallback, NSURLConnectionDelegate, PairCallback, UITextFieldDelegate>
 @property (strong, nonatomic) IBOutlet UIPickerView *HostPicker;
 - (IBAction)StreamButton:(UIButton *)sender;
 - (IBAction)PairButton:(UIButton *)sender;
diff --git a/Limelight/MainFrameViewController.m b/Limelight/MainFrameViewController.m
index 2d25685..17918f8 100644
--- a/Limelight/MainFrameViewController.m
+++ b/Limelight/MainFrameViewController.m
@@ -174,6 +174,15 @@ static StreamConfiguration* streamConfig;
     // Dispose of any resources that can be recreated.
 }
 
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    [self.view endEditing:YES];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return YES;
+}
+
 - (BOOL)shouldAutorotate {
     return YES;
 }
diff --git a/MainFrame-iPad.storyboard b/MainFrame-iPad.storyboard
index 18c5087..cbe41c1 100644
--- a/MainFrame-iPad.storyboard
+++ b/MainFrame-iPad.storyboard
@@ -54,6 +54,9 @@
                                 <rect key="frame" x="374" y="235" width="276" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="wb7-af-jn8" id="YMu-2k-Dyk"/>
+                                </connections>
                             </textField>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
diff --git a/MainFrame-iPhone.storyboard b/MainFrame-iPhone.storyboard
index f21e6c6..e1c21c1 100644
--- a/MainFrame-iPhone.storyboard
+++ b/MainFrame-iPhone.storyboard
@@ -48,6 +48,9 @@
                                 <rect key="frame" x="82" y="179" width="156" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="dgh-JZ-Q7z" id="DCy-4m-RHG"/>
+                                </connections>
                             </textField>
                             <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0xb-lk-PHK">
                                 <rect key="frame" x="0.0" y="307" width="320" height="162"/>