diff --git a/launcher/ui/pages/global/ExternalToolsPage.ui b/launcher/ui/pages/global/ExternalToolsPage.ui
index 8609d469..3643094d 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.ui
+++ b/launcher/ui/pages/global/ExternalToolsPage.ui
@@ -158,6 +158,9 @@
             <property name="text">
              <string>&amp;Text Editor:</string>
             </property>
+            <property name="buddy">
+             <cstring>jsonEditorTextBox</cstring>
+            </property>
            </widget>
           </item>
           <item row="0" column="2">
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index bb195770..083435d8 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -72,6 +72,9 @@
             <property name="text">
              <string>&amp;Minimum memory allocation:</string>
             </property>
+            <property name="buddy">
+             <cstring>minMemSpinBox</cstring>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -79,6 +82,9 @@
             <property name="text">
              <string>Ma&amp;ximum memory allocation:</string>
             </property>
+            <property name="buddy">
+             <cstring>maxMemSpinBox</cstring>
+            </property>
            </widget>
           </item>
           <item row="0" column="1">
@@ -108,6 +114,9 @@
             <property name="text">
              <string notr="true">&amp;PermGen:</string>
             </property>
+            <property name="buddy">
+             <cstring>permGenSpinBox</cstring>
+            </property>
            </widget>
           </item>
           <item row="2" column="1">
@@ -152,6 +161,9 @@
             <property name="text">
              <string>&amp;Java path:</string>
             </property>
+            <property name="buddy">
+             <cstring>javaPathTextBox</cstring>
+            </property>
            </widget>
           </item>
           <item row="0" column="1" colspan="2">
@@ -194,6 +206,9 @@
             <property name="text">
              <string>J&amp;VM arguments:</string>
             </property>
+            <property name="buddy">
+             <cstring>jvmArgsTextBox</cstring>
+            </property>
            </widget>
           </item>
           <item row="3" column="1">
diff --git a/launcher/ui/pages/global/ProxyPage.ui b/launcher/ui/pages/global/ProxyPage.ui
index 5a2fc73d..91ba46b3 100644
--- a/launcher/ui/pages/global/ProxyPage.ui
+++ b/launcher/ui/pages/global/ProxyPage.ui
@@ -147,6 +147,9 @@
             <property name="text">
              <string>&amp;Username:</string>
             </property>
+            <property name="buddy">
+             <cstring>proxyUserEdit</cstring>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -154,6 +157,9 @@
             <property name="text">
              <string>&amp;Password:</string>
             </property>
+            <property name="buddy">
+             <cstring>proxyPassEdit</cstring>
+            </property>
            </widget>
           </item>
           <item row="1" column="1">
diff --git a/launcher/ui/widgets/CustomCommands.ui b/launcher/ui/widgets/CustomCommands.ui
index 68e680a5..4a39ff7f 100644
--- a/launcher/ui/widgets/CustomCommands.ui
+++ b/launcher/ui/widgets/CustomCommands.ui
@@ -43,6 +43,9 @@
         <property name="text">
          <string>P&amp;ost-exit command:</string>
         </property>
+        <property name="buddy">
+         <cstring>postExitCmdTextBox</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -53,6 +56,9 @@
         <property name="text">
          <string>&amp;Pre-launch command:</string>
         </property>
+        <property name="buddy">
+         <cstring>preLaunchCmdTextBox</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="1">
@@ -63,6 +69,9 @@
         <property name="text">
          <string>&amp;Wrapper command:</string>
         </property>
+        <property name="buddy">
+         <cstring>wrapperCmdTextBox</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="1">