diff --git a/src/iOS.Extension/MainInterface.storyboard b/src/iOS.Extension/MainInterface.storyboard
index 9b3d91f38..d2d4bda10 100644
--- a/src/iOS.Extension/MainInterface.storyboard
+++ b/src/iOS.Extension/MainInterface.storyboard
@@ -235,20 +235,22 @@
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="4822" translatesAutoresizingMaskIntoConstraints="NO">
+                            <containerView contentMode="scaleToFill" id="4900" translatesAutoresizingMaskIntoConstraints="NO">
                                 <rect key="frame" x="0.0" y="109.5" width="600" height="490.5"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <sections/>
-                            </tableView>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                <connections>
+                                    <segue id="5421" destination="4912" kind="embed"/>
+                                </connections>
+                            </containerView>
                         </subviews>
                         <constraints>
-                            <constraint id="4850" firstItem="4822" firstAttribute="leading" secondItem="4581" secondAttribute="leading"/>
-                            <constraint id="4851" firstItem="4581" firstAttribute="trailing" secondItem="4822" secondAttribute="trailing"/>
-                            <constraint id="4852" firstItem="4572" firstAttribute="top" secondItem="4822" secondAttribute="bottom"/>
                             <constraint id="4853" firstItem="4811" firstAttribute="leading" secondItem="4581" secondAttribute="leading" constant="15"/>
                             <constraint id="4864" firstItem="4581" firstAttribute="trailing" secondItem="4811" secondAttribute="trailing" constant="15"/>
                             <constraint id="4875" firstItem="4811" firstAttribute="top" secondItem="4571" secondAttribute="bottom" constant="15"/>
-                            <constraint id="4876" firstItem="4822" firstAttribute="top" secondItem="4811" secondAttribute="bottom" constant="10"/>
+                            <constraint id="4907" firstItem="4900" firstAttribute="leading" secondItem="4581" secondAttribute="leading"/>
+                            <constraint id="4908" firstItem="4581" firstAttribute="trailing" secondItem="4900" secondAttribute="trailing"/>
+                            <constraint id="4909" firstItem="4900" firstAttribute="top" secondItem="4811" secondAttribute="bottom" constant="10"/>
+                            <constraint id="4910" firstItem="4572" firstAttribute="top" secondItem="4900" secondAttribute="bottom"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Generate Password" id="4580">
@@ -269,7 +271,6 @@
                         <outlet property="CancelBarButton" destination="4807" id="name-outlet-4807"/>
                         <outlet property="SelectBarButton" destination="4808" id="name-outlet-4808"/>
                         <outlet property="BaseView" destination="4581" id="name-outlet-4581"/>
-                        <outlet property="Table" destination="4822" id="name-outlet-4822"/>
                         <outlet property="PasswordLabel" destination="4811" id="name-outlet-4811"/>
                     </connections>
                 </viewController>
@@ -277,6 +278,26 @@
             </objects>
             <point key="canvasLocation" x="4045" y="558"/>
         </scene>
+        <scene sceneID="4911">
+            <objects>
+                <tableViewController id="4912" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="4913">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="490.5"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <connections>
+                            <outlet property="dataSource" destination="4912" id="4914"/>
+                            <outlet property="delegate" destination="4912" id="4915"/>
+                        </connections>
+                    </tableView>
+                    <connections>
+                        <outlet property="Table" destination="4913" id="name-outlet-4913"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4918" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4678" y="661"/>
+        </scene>
     </scenes>
     <resources>
         <image name="logo.png" width="282" height="44"/>
diff --git a/src/iOS.Extension/PasswordGeneratorViewController.designer.cs b/src/iOS.Extension/PasswordGeneratorViewController.designer.cs
index 4a484f86e..dc7c24eba 100644
--- a/src/iOS.Extension/PasswordGeneratorViewController.designer.cs
+++ b/src/iOS.Extension/PasswordGeneratorViewController.designer.cs
@@ -30,10 +30,6 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIBarButtonItem SelectBarButton { get; set; }
 
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UITableView Table { get; set; }
-
         [Action ("CancelBarButton_Activated:")]
         [GeneratedCode ("iOS Designer", "1.0")]
         partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender);
@@ -63,11 +59,6 @@ namespace Bit.iOS.Extension
                 SelectBarButton.Dispose ();
                 SelectBarButton = null;
             }
-
-            if (Table != null) {
-                Table.Dispose ();
-                Table = null;
-            }
         }
     }
 }
\ No newline at end of file