diff --git a/ui/src/app/settings/components/repos-list/repos-list.tsx b/ui/src/app/settings/components/repos-list/repos-list.tsx
index f3669060b8..b20f850876 100644
--- a/ui/src/app/settings/components/repos-list/repos-list.tsx
+++ b/ui/src/app/settings/components/repos-list/repos-list.tsx
@@ -1,4 +1,4 @@
-import {DropDownMenu, FormField, NotificationType, SlidingPanel} from 'argo-ui';
+import {DropDownMenu, FormField, FormSelect, NotificationType, SlidingPanel} from 'argo-ui';
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
 import {Form, FormApi, Text, TextArea} from 'react-form';
@@ -127,6 +127,7 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                     <h4>Connect repo using HTTPS</h4>
                     <Form onSubmit={(params) => this.connectHTTPSRepo(params as NewHTTPSRepoParams)}
                           getApi={(api) => this.formApiHTTPS = api}
+                          defaultValues={{type: 'git'}}
                           validateError={(params: NewHTTPSRepoParams) => ({
                               url: !params.url && 'Repo URL is required',
                               password: !params.password && params.username && 'Password is required if username is given.',
@@ -135,11 +136,10 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                         {(formApi) => (
                             <form onSubmit={formApi.submitForm} role='form' className='repos-list width-control'>
                                 <div className='argo-form-row'>
-                                    <FormField formApi={formApi} label='Type' field='type' component={Text}/>
-                                    Either empty, "git" or "helm".
+                                    <FormField formApi={formApi} label='Type' field='type' component={FormSelect} componentProps={{options: ['git', 'helm']}}/>
                                 </div>
                                 <div className='argo-form-row'>
-                                    <FormField formApi={formApi} label='Name' field='name' component={Text}/>
+                                    <FormField formApi={formApi} label='Name (optional for Git)' field='name' component={Text}/>
                                 </div>
                                 <div className='argo-form-row'>
                                     <FormField formApi={formApi} label='Repository URL' field='url' component={Text}/>
@@ -161,7 +161,7 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                                     <FormField formApi={formApi} label='Skip server verification' field='insecure' component={CheckboxField}/>
                                 </div>
                                 <div className='argo-form-row'>
-                                    <FormField formApi={formApi} label='Enable LFS support' field='enableLfs' component={CheckboxField}/>
+                                    <FormField formApi={formApi} label='Enable LFS support (Git only)' field='enableLfs' component={CheckboxField}/>
                                 </div>
                             </form>
                         )}
@@ -187,11 +187,10 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                         {(formApi) => (
                             <form onSubmit={formApi.submitForm} role='form' className='repos-list width-control'>
                                 <div className='argo-form-row'>
-                                    <FormField formApi={formApi} label='Type' field='type' component={Text}/>
-                                    Either empty, "git" or "helm".
+                                    <FormField formApi={formApi} label='Type' field='type' component={FormSelect} componentProps={{options: ['git', 'helm']}}/>
                                 </div>
                                 <div className='argo-form-row'>
-                                    <FormField formApi={formApi} label='Name' field='name' component={Text}/>
+                                    <FormField formApi={formApi} label='Name (optional for Git)' field='name' component={Text}/>
                                 </div>
                                 <div className='argo-form-row'>
                                     <FormField formApi={formApi} label='Repository URL' field='url' component={Text}/>
@@ -203,7 +202,7 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
                                     <FormField formApi={formApi} label='Skip server verification' field='insecure' component={CheckboxField}/>
                                 </div>
                                 <div className='argo-form-row'>
-                                    <FormField formApi={formApi} label='Enable LFS support' field='enableLfs' component={CheckboxField}/>
+                                    <FormField formApi={formApi} label='Enable LFS support (Git only)' field='enableLfs' component={CheckboxField}/>
                                 </div>
                             </form>
                         )}
diff --git a/util/git/repo/repo.go b/util/git/repo/repo.go
index 0bf02de632..de34885909 100644
--- a/util/git/repo/repo.go
+++ b/util/git/repo/repo.go
@@ -41,6 +41,10 @@ func (g gitRepo) ListApps(revision string) (map[string]string, string, error) {
 	if err != nil {
 		return nil, "", err
 	}
+	err = g.client.Checkout(resolvedRevision)
+	if err != nil {
+		return nil, "", err
+	}
 	apps, err := g.disco(g.client.Root())
 	return apps, resolvedRevision, err
 }