diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6978c1e67..f2122fd0bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Missing synchronization during repository creation ([#1328](https://github.com/scm-manager/scm-manager/pull/1328))
 - Missing BranchCreatedEvent for mercurial ([#1334](https://github.com/scm-manager/scm-manager/pull/1334))
 - Branch not found right after creation ([#1334](https://github.com/scm-manager/scm-manager/pull/1334))
+- Set default branch in branch selector if nothing is selected ([#1338](https://github.com/scm-manager/scm-manager/pull/1338))
 - Handling of branch with slashes in source view ([#1340](https://github.com/scm-manager/scm-manager/pull/1340))
 
 ## [2.5.0] - 2020-09-10
diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
index ab691be69c..f6caa08c9b 100644
--- a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
@@ -102,7 +102,7 @@ const ContributorDetails = styled.div`
 
 const ContributorToggleLine = styled.p`
   cursor: pointer;
-  /** maring-bottom is inherit from content p **/
+  /** margin-bottom is inherit from content p **/
   margin-bottom: 0.5rem !important;
 `;
 
diff --git a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
index 62ecd0adb3..b8dfd47544 100644
--- a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
@@ -70,12 +70,13 @@ class ChangesetsRoot extends React.Component<Props> {
     }
 
     const url = urls.stripEndingSlash(match.url);
+    const defaultBranch = branches?.find(b => b.defaultBranch === true);
 
     return (
       <>
         <CodeActionBar
           branches={branches}
-          selectedBranch={!this.isBranchAvailable() ? selectedBranch : undefined}
+          selectedBranch={!this.isBranchAvailable() ? selectedBranch : defaultBranch?.name}
           onSelectBranch={this.onSelectBranch}
           switchViewLink={this.evaluateSwitchViewLink()}
         />