diff --git a/pkg/gui/controllers.go b/pkg/gui/controllers.go
index 65474f09b..9cb98a894 100644
--- a/pkg/gui/controllers.go
+++ b/pkg/gui/controllers.go
@@ -174,7 +174,6 @@ 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)
@@ -311,13 +310,11 @@ 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/main_view_controller.go b/pkg/gui/controllers/main_view_controller.go
index 822c1b562..97669f6fd 100644
--- a/pkg/gui/controllers/main_view_controller.go
+++ b/pkg/gui/controllers/main_view_controller.go
@@ -124,6 +124,12 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			Description: self.c.Tr.StartSearch,
 			Tag:         "navigation",
 		},
+		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.handlePrevLine},
+		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.handleNextLine},
+		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.handlePrevPage, Description: self.c.Tr.PrevPage},
+		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.handleNextPage, Description: self.c.Tr.NextPage},
+		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop},
+		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom},
 	}
 }
 
@@ -306,6 +312,75 @@ func (self *MainViewController) prevFile() error {
 	return self.navigate(self.c.Helpers().Staging.AdjacentFile, false)
 }
 
+func (self *MainViewController) handleLineChange(delta int) {
+	v := self.context.GetView()
+	if v.Highlight {
+		lineIdxBefore := v.CursorY() + v.OriginY()
+		lineIdxAfter := lo.Clamp(lineIdxBefore+delta, 0, v.ViewLinesHeight()-1)
+		if delta == -1 {
+			checkScrollUp(self.context.GetViewTrait(), self.c.UserConfig(), lineIdxBefore, lineIdxAfter)
+		} else if delta == 1 {
+			checkScrollDown(self.context.GetViewTrait(), self.c.UserConfig(), lineIdxBefore, lineIdxAfter)
+		}
+		v.FocusPoint(0, lineIdxAfter, true)
+	} else {
+		if delta < 0 {
+			v.ScrollUp(-delta)
+		} else {
+			v.ScrollDown(delta)
+			self.c.ReadLinesToFillView(v)
+		}
+	}
+}
+
+func (self *MainViewController) handlePrevLine() error {
+	self.handleLineChange(-1)
+	return nil
+}
+
+func (self *MainViewController) handleNextLine() error {
+	self.handleLineChange(1)
+	return nil
+}
+
+func (self *MainViewController) handlePrevPage() error {
+	self.handleLineChange(-self.context.GetViewTrait().PageDelta())
+	return nil
+}
+
+func (self *MainViewController) handleNextPage() error {
+	self.handleLineChange(self.context.GetViewTrait().PageDelta())
+	return nil
+}
+
+func (self *MainViewController) handleGotoTop() error {
+	v := self.context.GetView()
+	if v.Highlight {
+		v.FocusPoint(0, 0, true)
+	} else {
+		self.handleLineChange(-v.ViewLinesHeight())
+	}
+	return nil
+}
+
+func (self *MainViewController) handleGotoBottom() error {
+	if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil {
+		manager.ReadToEnd(func() {
+			self.c.OnUIThread(func() error {
+				v := self.context.GetView()
+				if v.Highlight {
+					v.FocusPoint(0, v.ViewLinesHeight()-1, true)
+				} else {
+					self.handleLineChange(v.ViewLinesHeight())
+				}
+				return nil
+			})
+		})
+	}
+
+	return nil
+}
+
 // sidePanelShowsDiff reports whether the given side panel's focused main view
 // shows a diff, which is when we show a selection in it (so the user can stage a
 // line, edit it, jump by hunk/file, or open it in a PR). Panels whose main view
diff --git a/pkg/gui/controllers/view_selection_controller.go b/pkg/gui/controllers/view_selection_controller.go
deleted file mode 100644
index f14a33d80..000000000
--- a/pkg/gui/controllers/view_selection_controller.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package controllers
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/samber/lo"
-)
-
-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", Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.handlePrevLine},
-		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.handleNextLine},
-		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.handlePrevPage, Description: self.c.Tr.PrevPage},
-		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.handleNextPage, Description: self.c.Tr.NextPage},
-		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop},
-		{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom},
-	}
-}
-
-func (self *ViewSelectionController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
-	return []*gocui.ViewMouseBinding{}
-}
-
-func (self *ViewSelectionController) handleLineChange(delta int) {
-	v := self.Context().GetView()
-	if self.context.GetView().Highlight {
-		lineIdxBefore := v.CursorY() + v.OriginY()
-		lineIdxAfter := lo.Clamp(lineIdxBefore+delta, 0, v.ViewLinesHeight()-1)
-		if delta == -1 {
-			checkScrollUp(self.Context().GetViewTrait(), self.c.UserConfig(), lineIdxBefore, lineIdxAfter)
-		} else if delta == 1 {
-			checkScrollDown(self.Context().GetViewTrait(), self.c.UserConfig(), lineIdxBefore, lineIdxAfter)
-		}
-		v.FocusPoint(0, lineIdxAfter, true)
-	} else {
-		if delta < 0 {
-			v.ScrollUp(-delta)
-		} else {
-			v.ScrollDown(delta)
-			self.c.ReadLinesToFillView(v)
-		}
-	}
-}
-
-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()
-	if self.context.GetView().Highlight {
-		v.FocusPoint(0, 0, true)
-	} else {
-		self.handleLineChange(-v.ViewLinesHeight())
-	}
-	return nil
-}
-
-func (self *ViewSelectionController) handleGotoBottom() error {
-	if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil {
-		manager.ReadToEnd(func() {
-			self.c.OnUIThread(func() error {
-				v := self.Context().GetView()
-				if self.context.GetView().Highlight {
-					v.FocusPoint(0, v.ViewLinesHeight()-1, true)
-				} else {
-					self.handleLineChange(v.ViewLinesHeight())
-				}
-				return nil
-			})
-		})
-	}
-
-	return nil
-}