diff --git a/pkg/gui/controllers.go b/pkg/gui/controllers.go
index 6abd93406..e6f6bbb4e 100644
--- a/pkg/gui/controllers.go
+++ b/pkg/gui/controllers.go
@@ -181,6 +181,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 	contextLinesController := controllers.NewContextLinesController(common)
 	renameSimilarityThresholdController := controllers.NewRenameSimilarityThresholdController(common)
 	verticalScrollControllerFactory := controllers.NewVerticalScrollControllerFactory(common)
+	viewSelectionControllerFactory := controllers.NewViewSelectionControllerFactory(common)
 
 	branchesController := controllers.NewBranchesController(common)
 	gitFlowController := controllers.NewGitFlowController(common)
@@ -327,11 +328,13 @@ func (gui *Gui) resetHelpersAndControllers() {
 	controllers.AttachControllers(gui.State.Contexts.Normal,
 		mainViewController,
 		verticalScrollControllerFactory.Create(gui.State.Contexts.Normal),
+		viewSelectionControllerFactory.Create(gui.State.Contexts.Normal),
 	)
 
 	controllers.AttachControllers(gui.State.Contexts.NormalSecondary,
 		secondaryViewController,
 		verticalScrollControllerFactory.Create(gui.State.Contexts.NormalSecondary),
+		viewSelectionControllerFactory.Create(gui.State.Contexts.NormalSecondary),
 	)
 
 	controllers.AttachControllers(gui.State.Contexts.Files,
diff --git a/pkg/gui/controllers/view_selection_controller.go b/pkg/gui/controllers/view_selection_controller.go
new file mode 100644
index 000000000..e961e9979
--- /dev/null
+++ b/pkg/gui/controllers/view_selection_controller.go
@@ -0,0 +1,101 @@
+package controllers
+
+import (
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+)
+
+type ViewSelectionControllerFactory struct {
+	c *ControllerCommon
+}
+
+func NewViewSelectionControllerFactory(c *ControllerCommon) *ViewSelectionControllerFactory {
+	return &ViewSelectionControllerFactory{
+		c: c,
+	}
+}
+
+func (self *ViewSelectionControllerFactory) Create(context types.Context) types.IController {
+	return &ViewSelectionController{
+		baseController: baseController{},
+		c:              self.c,
+		context:        context,
+	}
+}
+
+type ViewSelectionController struct {
+	baseController
+	c *ControllerCommon
+
+	context types.Context
+}
+
+func (self *ViewSelectionController) Context() types.Context {
+	return self.context
+}
+
+func (self *ViewSelectionController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
+	return []*types.Binding{
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItem), Handler: self.handlePrevLine},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), Handler: self.handlePrevLine},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItem), Handler: self.handleNextLine},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItemAlt), Handler: self.handleNextLine},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevPage), Handler: self.handlePrevPage, Description: self.c.Tr.PrevPage},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextPage), Handler: self.handleNextPage, Description: self.c.Tr.NextPage},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop, Alternative: "<home>"},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom, Alternative: "<end>"},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTopAlt), Handler: self.handleGotoTop},
+		{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottomAlt), Handler: self.handleGotoBottom},
+	}
+}
+
+func (self *ViewSelectionController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
+	return []*gocui.ViewMouseBinding{}
+}
+
+func (self *ViewSelectionController) handleLineChange(delta int) {
+	if delta > 0 {
+		if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil {
+			manager.ReadLines(delta)
+		}
+	}
+
+	v := self.Context().GetView()
+	if delta < 0 {
+		v.ScrollUp(-delta)
+	} else {
+		v.ScrollDown(delta)
+	}
+}
+
+func (self *ViewSelectionController) handlePrevLine() error {
+	self.handleLineChange(-1)
+	return nil
+}
+
+func (self *ViewSelectionController) handleNextLine() error {
+	self.handleLineChange(1)
+	return nil
+}
+
+func (self *ViewSelectionController) handlePrevPage() error {
+	self.handleLineChange(-self.context.GetViewTrait().PageDelta())
+	return nil
+}
+
+func (self *ViewSelectionController) handleNextPage() error {
+	self.handleLineChange(self.context.GetViewTrait().PageDelta())
+	return nil
+}
+
+func (self *ViewSelectionController) handleGotoTop() error {
+	v := self.Context().GetView()
+	self.handleLineChange(-v.ViewLinesHeight())
+	return nil
+}
+
+func (self *ViewSelectionController) handleGotoBottom() error {
+	v := self.Context().GetView()
+	self.handleLineChange(v.ViewLinesHeight())
+	return nil
+}