       else
         offset = 1
 
-    index = Math.min(Math.max(index + offset, 0), @_view.count() - 1)
+    index = Math.min(Math.max(index + offset, 0), @_view.count() - 2)
     nextKeyboard = nextFocus = @_view.get(index)
 
     # Remove the current thread from selection


    @_viewUnlisten = view.listen ->
      @trigger(@)
      @_autofocusForLayoutMode()
    ,@

    @trigger(@)

      Actions.setCursorPosition(collection: 'thread', item: nextKeyboard)
    Actions.queueTask(task)

module.exports = new ThreadListStore()
