diff --git a/MacPass/EntryInspectorView.xib b/MacPass/EntryInspectorView.xib
index d3516454..317b0f9b 100644
--- a/MacPass/EntryInspectorView.xib
+++ b/MacPass/EntryInspectorView.xib
@@ -486,7 +486,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
-                        <outlet property="nextKeyView" destination="55" id="zdp-8L-2De"/>
+                        <outlet property="nextKeyView" destination="55" id="FgE-cj-E5Z"/>
                     </connections>
                 </textField>
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="54">
@@ -507,7 +507,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
-                        <outlet property="nextKeyView" destination="56" id="XBy-DG-08B"/>
+                        <outlet property="nextKeyView" destination="60" id="ZPp-lg-TBS"/>
                     </connections>
                 </textField>
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="56" customClass="HNHRoundedTextField">
@@ -519,7 +519,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
-                        <outlet property="nextKeyView" destination="60" id="1Df-fB-wSk"/>
+                        <outlet property="nextKeyView" destination="7" id="8Vo-ZR-aWE"/>
                     </connections>
                 </textField>
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="57">
@@ -549,6 +549,7 @@
                     </buttonCell>
                     <connections>
                         <action selector="_popUpPasswordGenerator:" target="-2" id="272"/>
+                        <outlet property="nextKeyView" destination="56" id="rY0-PH-WBT"/>
                     </connections>
                 </button>
                 <secureTextField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="60" customClass="HNHRoundedSecureTextField">
@@ -603,7 +604,7 @@
                     </buttonCell>
                     <connections>
                         <action selector="pickExpiryDate:" target="-1" id="DQK-sp-SIL"/>
-                        <outlet property="nextKeyView" destination="5" id="Yg4-Ua-HVe"/>
+                        <outlet property="nextKeyView" destination="5" id="cVg-qt-OBX"/>
                     </connections>
                 </button>
                 <tokenField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5">
@@ -617,6 +618,9 @@
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </tokenFieldCell>
+                    <connections>
+                        <outlet property="nextKeyView" destination="53" id="Bzj-Cf-ZRv"/>
+                    </connections>
                 </tokenField>
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6">
                     <rect key="frame" x="18" y="105" width="29" height="14"/>
diff --git a/MacPass/GroupInspectorView.xib b/MacPass/GroupInspectorView.xib
index 058e848d..d5488b0c 100644
--- a/MacPass/GroupInspectorView.xib
+++ b/MacPass/GroupInspectorView.xib
@@ -46,6 +46,9 @@
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
+                                <connections>
+                                    <outlet property="nextKeyView" destination="5" id="KV0-QE-2i4"/>
+                                </connections>
                             </textField>
                             <button horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5">
                                 <rect key="frame" x="18" y="128" width="67" height="18"/>
@@ -54,6 +57,9 @@
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <connections>
+                                    <outlet property="nextKeyView" destination="4" id="Rem-Pk-yFJ"/>
+                                </connections>
                             </button>
                             <button focusRingType="exterior" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4">
                                 <rect key="frame" x="206" y="127" width="31" height="19"/>
@@ -67,6 +73,7 @@
                                 </buttonCell>
                                 <connections>
                                     <action selector="pickExpiryDate:" target="-1" id="KIc-p2-zJQ"/>
+                                    <outlet property="nextKeyView" destination="229" id="12E-SZ-Mtu"/>
                                 </connections>
                             </button>
                             <popUpButton verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="229">
@@ -85,6 +92,9 @@
                                         </items>
                                     </menu>
                                 </popUpButtonCell>
+                                <connections>
+                                    <outlet property="nextKeyView" destination="240" id="XsX-U5-uZd"/>
+                                </connections>
                             </popUpButton>
                             <popUpButton verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="240">
                                 <rect key="frame" x="18" y="17" width="222" height="26"/>
@@ -100,6 +110,9 @@
                                         </items>
                                     </menu>
                                 </popUpButtonCell>
+                                <connections>
+                                    <outlet property="nextKeyView" destination="23" id="uir-lY-3HQ"/>
+                                </connections>
                             </popUpButton>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="264">
                                 <rect key="frame" x="18" y="104" width="40" height="14"/>