diff --git a/internal/tui/components/app/app.go b/internal/tui/components/app/app.go
index 7b36e9da..9af3b0a0 100644
--- a/internal/tui/components/app/app.go
+++ b/internal/tui/components/app/app.go
@@ -176,9 +176,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if m.currentPageLoading() {
 				m.getCurrentPageModel().SetViewportXOffset(0)
 			}
-			if m.getCurrentPageModel().FilterWithContext {
-				m.getCurrentPageModel().ResetContextFilter()
-			}
+			//if m.getCurrentPageModel().FilterWithContext {
+			// I don't remember why I originally had this here, but it seems unequivocally bad:
+			// https://github.com/robinovitch61/wander/issues/128
+			// Delete this soon if no issues arise from its removal. If they do, comment why you have this here :)
+			//m.getCurrentPageModel().ResetContextFilter()
+			//}
 			m.getCurrentPageModel().SetLoading(false)
 
 			if m.currentPage.CanBeFirstPage() && len(msg.AllPageRows) == 0 {
diff --git a/internal/tui/components/page/util.go b/internal/tui/components/page/util.go
index 73c94d18..2a47885e 100644
--- a/internal/tui/components/page/util.go
+++ b/internal/tui/components/page/util.go
@@ -35,6 +35,8 @@ func (d *data) IncrementFilteredSelectionNum() {
 	d.FilteredSelectionNum++
 	if d.FilteredSelectionNum >= len(d.FilteredContentIdxs) {
 		d.FilteredSelectionNum = 0
+	} else if d.FilteredSelectionNum < 0 {
+		d.FilteredSelectionNum = 0
 	}
 	d.CurrentFilteredContentIdx = d.FilteredContentIdxs[d.FilteredSelectionNum]
 }
@@ -46,6 +48,8 @@ func (d *data) DecrementFilteredSelectionNum() {
 	d.FilteredSelectionNum--
 	if d.FilteredSelectionNum < 0 {
 		d.FilteredSelectionNum = len(d.FilteredContentIdxs) - 1
+	} else if d.FilteredSelectionNum >= len(d.FilteredContentIdxs) {
+		d.FilteredSelectionNum = len(d.FilteredContentIdxs) - 1
 	}
 	d.CurrentFilteredContentIdx = d.FilteredContentIdxs[d.FilteredSelectionNum]
 }