diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx
index 3702cd5817..6a7d390146 100644
--- a/scm-ui/ui-components/src/repos/DiffFile.tsx
+++ b/scm-ui/ui-components/src/repos/DiffFile.tsx
@@ -415,25 +415,25 @@ class DiffFile extends React.Component<Props, State> {
     }
     const collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit"/> : null;
     const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
-    const sideBySideToggle =
-      file.hunks && file.hunks.length > 0 && (
+    const sideBySideToggle = file.hunks && file.hunks.length && <MenuContext.Consumer>
+      {({setCollapsed}) => (
+        <DiffButton
+          icon={sideBySide ? "align-left" : "columns"}
+          tooltip={t(sideBySide ? "diff.combined" : "diff.sideBySide")}
+          onClick={() =>
+            this.toggleSideBySide(() => {
+              if (this.state.sideBySide) {
+                setCollapsed(true);
+              }
+            })
+          }
+        />
+      )}
+    </MenuContext.Consumer>;
+    const headerButtons = (
         <ButtonWrapper className={classNames("level-right", "is-flex")}>
           <ButtonGroup>
-            <MenuContext.Consumer>
-              {({setCollapsed}) => (
-                <DiffButton
-                  icon={sideBySide ? "align-left" : "columns"}
-                  tooltip={t(sideBySide ? "diff.combined" : "diff.sideBySide")}
-                  onClick={() =>
-                    this.toggleSideBySide(() => {
-                      if (this.state.sideBySide) {
-                        setCollapsed(true);
-                      }
-                    })
-                  }
-                />
-              )}
-            </MenuContext.Consumer>
+            {sideBySideToggle}
             {fileControls}
           </ButtonGroup>
         </ButtonWrapper>
@@ -467,7 +467,7 @@ class DiffFile extends React.Component<Props, State> {
               </TitleWrapper>
               {this.renderChangeTag(file)}
             </FullWidthTitleHeader>
-            {sideBySideToggle}
+            {headerButtons}
           </FlexWrapLevel>
         </div>
         {body}
diff --git a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx
index 6235854bf6..e835c0ea1d 100644
--- a/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx
@@ -177,7 +177,7 @@ class RepositoryRoot extends React.Component<Props> {
           break;
         default:
           if (targetLink) {
-            links.push(sourceLink, targetLink);
+            links.push(targetLink, sourceLink); // Target link first because its the previous file
           } else {
             links.push(sourceLink);
           }