diff --git a/client/tui/tui.go b/client/tui/tui.go
index 4f43f17..72309b1 100644
--- a/client/tui/tui.go
+++ b/client/tui/tui.go
@@ -290,10 +290,7 @@ func updateTable(m model, rows []table.Row, entries []*data.HistoryEntry, search
 	}
 	m.lastQuery = *m.runQuery
 	m.runQuery = nil
-	if m.table.Cursor() >= len(m.tableEntries) {
-		// Ensure that we can't scroll past the end of the table
-		m.table.SetCursor(len(m.tableEntries) - 1)
-	}
+	preventTableOverscrolling(m)
 	return m
 }