@@ -749,8 +749,8 @@ func (m *model) ensureVisibleReverse(cachedItem renderedItem) {
749749func (m *model) goToBottom() tea.Cmd {
750750 cmds := []tea.Cmd{m.blurSelected()}
751751 m.viewState.reverse = true
752+ m.selectionState.selectedIndex = m.findLastSelectableItem()
752753 if m.isFocused {
753− m.selectionState.selectedIndex = m.findLastSelectableItem()
754754 cmds = append(cmds, m.focusSelected())
755755 }
756756 m.ResetView()
@@ -764,7 +764,9 @@ func (m *model) goToTop() tea.Cmd {
764764 cmds := []tea.Cmd{m.blurSelected()}
765765 m.viewState.reverse = false
766766 m.selectionState.selectedIndex = m.findFirstSelectableItem()
767− cmds = append(cmds, m.focusSelected())
767+ if m.isFocused {
768+ cmds = append(cmds, m.focusSelected())
769+ }
768770 m.ResetView()
769771 return tea.Batch(cmds...)
770772}