diff --git a/scm-ui/src/repos/containers/BranchChooser.js b/scm-ui/src/repos/containers/BranchChooser.js
index 607d96882c..007060acf1 100644
--- a/scm-ui/src/repos/containers/BranchChooser.js
+++ b/scm-ui/src/repos/containers/BranchChooser.js
@@ -18,7 +18,8 @@ type Props = {
   callback: (?Branch) => void,
   branches: Branch[],
   selectedBranchName: string,
-  loading: boolean
+  loading: boolean,
+  label: string
 };
 
 type State = {
@@ -39,17 +40,20 @@ class BranchChooser extends React.Component<Props, State> {
   }
 
   render() {
-    const { branches, loading } = this.props;
+    const { branches, loading, label } = this.props;
     if (loading) {
       return <Loading />;
     }
     if (branches && branches.length > 0) {
       return (
-        <DropDown
-          options={branches.map(b => b.name)}
-          preselectedOption={this.state.selectedBranchName}
-          optionSelected={branch => this.branchChanged(branch)}
-        />
+        <div className={"box"}>
+          <label className="label">{label}</label>
+          <DropDown
+            options={branches.map(b => b.name)}
+            preselectedOption={this.state.selectedBranchName}
+            optionSelected={branch => this.branchChanged(branch)}
+          />
+        </div>
       );
     }
 
diff --git a/scm-ui/src/repos/containers/Changesets.js b/scm-ui/src/repos/containers/Changesets.js
index 7e7dcc33f3..23841ffe96 100644
--- a/scm-ui/src/repos/containers/Changesets.js
+++ b/scm-ui/src/repos/containers/Changesets.js
@@ -144,16 +144,12 @@ class Changesets extends React.PureComponent<Props, State> {
 
     return (
       <>
-        <div className={"box"}>
-          <label className="label">
-            {t("changesets.branchselector-label")}
-          </label>
-          <BranchChooser
-            repository={repository}
-            selectedBranchName={branch}
-            callback={branch => this.branchChanged(branch)}
-          />
-        </div>
+        <BranchChooser
+          repository={repository}
+          selectedBranchName={branch}
+          label={t("changesets.branchselector-label")}
+          callback={branch => this.branchChanged(branch)}
+        />
         <ChangesetList repository={repository} changesets={changesets} />
       </>
     );
diff --git a/scm-ui/src/repos/modules/branches.js b/scm-ui/src/repos/modules/branches.js
index 6d70ae0925..c771a9734e 100644
--- a/scm-ui/src/repos/modules/branches.js
+++ b/scm-ui/src/repos/modules/branches.js
@@ -132,14 +132,14 @@ export function getBranch(
   state: Object,
   repository: Repository,
   name: string
-): ?Branch {
+): Branch {
   const key = createKey(repository);
   if (state.branches[key]) {
     if (state.branches[key].byNames[name]) {
       return state.branches[key].byNames[name];
     }
   }
-  return undefined;
+  return null;
 }
 
 export function isFetchBranchesPending(