diff --git a/pkg/gui/diffing.go b/pkg/gui/diffing.go
index dc5fca1e8..633efa600 100644
--- a/pkg/gui/diffing.go
+++ b/pkg/gui/diffing.go
@@ -18,6 +18,8 @@ func (gui *Gui) exitDiffMode() error {
 }
 
 func (gui *Gui) renderDiff() error {
+	gui.getMainView().Title = "Diff"
+	gui.State.SplitMainPanel = false
 	filterArg := ""
 	if gui.inFilterMode() {
 		filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath)
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 620453d5a..635ca69dd 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -27,6 +27,12 @@ func (gui *Gui) getSelectedFile() (*commands.File, error) {
 }
 
 func (gui *Gui) selectFile(alreadySelected bool) error {
+	gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLine)
+
+	if gui.inDiffMode() {
+		return gui.renderDiff()
+	}
+
 	file, err := gui.getSelectedFile()
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
@@ -37,8 +43,6 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles"))
 	}
 
-	gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLine)
-
 	if !alreadySelected {
 		if err := gui.resetOrigin(gui.getMainView()); err != nil {
 			return err
@@ -48,10 +52,6 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		}
 	}
 
-	if gui.inDiffMode() {
-		return gui.renderDiff()
-	}
-
 	if file.HasInlineMergeConflicts {
 		gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle")
 		gui.State.SplitMainPanel = false