diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js
index ec5bc9d66..0d7c0cbba 100644
--- a/frontend/src/Settings/General/UpdateSettings.js
+++ b/frontend/src/Settings/General/UpdateSettings.js
@@ -8,12 +8,17 @@ import { inputTypes, sizes } from 'Helpers/Props';
 import titleCase from 'Utilities/String/titleCase';
 import translate from 'Utilities/String/translate';
 
+const branchValues = [
+  'master',
+  'develop',
+  'nightly'
+];
+
 function UpdateSettings(props) {
   const {
     advancedSettings,
     settings,
     isWindows,
-    isDocker,
     packageUpdateMechanism,
     onInputChange
   } = props;
@@ -50,16 +55,15 @@ function UpdateSettings(props) {
         advancedSettings={advancedSettings}
         isAdvanced={true}
       >
-        <FormLabel>
-          {translate('Branch')}
-        </FormLabel>
+        <FormLabel>{translate('Branch')}</FormLabel>
 
         <FormInputGroup
-          type={inputTypes.TEXT}
+          type={inputTypes.AUTO_COMPLETE}
           name="branch"
           helpText={usingExternalUpdateMechanism ? translate('UsingExternalUpdateMechanismBranchUsedByExternalUpdateMechanism') : translate('UsingExternalUpdateMechanismBranchToUseToUpdateLidarr')}
           helpLink="https://wiki.servarr.com/lidarr/faq#how-do-i-update-lidarr"
           {...branch}
+          values={branchValues}
           onChange={onInputChange}
           readOnly={usingExternalUpdateMechanism}
         />
@@ -73,9 +77,7 @@ function UpdateSettings(props) {
               isAdvanced={true}
               size={sizes.MEDIUM}
             >
-              <FormLabel>
-                {translate('Automatic')}
-              </FormLabel>
+              <FormLabel>{translate('Automatic')}</FormLabel>
 
               <FormInputGroup
                 type={inputTypes.CHECK}
@@ -91,9 +93,7 @@ function UpdateSettings(props) {
               advancedSettings={advancedSettings}
               isAdvanced={true}
             >
-              <FormLabel>
-                {translate('Mechanism')}
-              </FormLabel>
+              <FormLabel>{translate('Mechanism')}</FormLabel>
 
               <FormInputGroup
                 type={inputTypes.SELECT}
@@ -112,9 +112,7 @@ function UpdateSettings(props) {
                   advancedSettings={advancedSettings}
                   isAdvanced={true}
                 >
-                  <FormLabel>
-                    {translate('ScriptPath')}
-                  </FormLabel>
+                  <FormLabel>{translate('ScriptPath')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.TEXT}