diff --git a/Limelight/ViewControllers/SettingsViewController.h b/Limelight/ViewControllers/SettingsViewController.h
index 0b8499d..eee65ce 100644
--- a/Limelight/ViewControllers/SettingsViewController.h
+++ b/Limelight/ViewControllers/SettingsViewController.h
@@ -16,6 +16,7 @@
 @property (strong, nonatomic) IBOutlet UISegmentedControl *resolutionSelector;
 @property (strong, nonatomic) IBOutlet UISegmentedControl *onscreenControlSelector;
 @property (strong, nonatomic) IBOutlet UISegmentedControl *remoteSelector;
+@property (strong, nonatomic) IBOutlet UIScrollView *scrollView;
 
 - (void) saveSettings;
 
diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m
index 272a655..56ccc79 100644
--- a/Limelight/ViewControllers/SettingsViewController.m
+++ b/Limelight/ViewControllers/SettingsViewController.m
@@ -18,9 +18,33 @@
 }
 static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
 
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
+-(void)viewDidLayoutSubviews {
+    // On iPhone layouts, this view is rooted at a ScrollView. To make it
+    // scrollable, we'll update content size here.
+    if (self.scrollView != nil) {
+        CGFloat highestViewY = 0;
+        
+        // Enumerate the scroll view's subviews looking for the
+        // highest view Y value to set our scroll view's content
+        // size.
+        for (UIView* view in self.scrollView.subviews) {
+            // UIScrollViews have 2 default UIImageView children
+            // which represent the horizontal and vertical scrolling
+            // indicators. Ignore these when computing content size.
+            if ([view isKindOfClass:[UIImageView class]]) {
+                continue;
+            }
+            
+            CGFloat currentViewY = view.frame.origin.y + view.frame.size.height;
+            if (currentViewY > highestViewY) {
+                highestViewY = currentViewY;
+            }
+        }
+        
+        // Add a bit of padding so the view doesn't end right at the button of the display
+        self.scrollView.contentSize = CGSizeMake(self.scrollView.contentSize.width,
+                                                 highestViewY + 20);
+    }
     
     // Adjust the subviews for the safe area on the iPhone X.
     if (!_adjustedForSafeArea) {
diff --git a/iPhone.storyboard b/iPhone.storyboard
index 113a31f..e4c7306 100644
--- a/iPhone.storyboard
+++ b/iPhone.storyboard
@@ -185,6 +185,7 @@
                         <outlet property="onscreenControlSelector" destination="WGf-9d-eAm" id="hob-se-4Sn"/>
                         <outlet property="remoteSelector" destination="FyK-g5-ohw" id="E6P-WS-0qb"/>
                         <outlet property="resolutionSelector" destination="PCM-t4-Sha" id="t60-W2-wkV"/>
+                        <outlet property="scrollView" destination="iNk-qF-gIr" id="h7U-Xp-ULQ"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="RWc-Km-KG5" userLabel="First Responder" sceneMemberID="firstResponder"/>