diff --git a/internal_packages/thread-list/lib/thread-list-store.coffee b/internal_packages/thread-list/lib/thread-list-store.coffee
index 3045e567d..f427986b7 100644
--- a/internal_packages/thread-list/lib/thread-list-store.coffee
+++ b/internal_packages/thread-list/lib/thread-list-store.coffee
@@ -138,10 +138,14 @@ class ThreadListStore extends NylasStore
 
   _onToggleStarFocused: ->
     focused = FocusedContentStore.focused('thread')
-    return unless focused
+    cursor = FocusedContentStore.keyboardCursor('thread')
+    if focused
+      task = new ChangeStarredTask(thread: focused, starred: !focused.starred)
+    else if cursor
+      task = new ChangeStarredTask(thread: cursor, starred: !cursor.starred)
 
-    task = new ChangeStarredTask(thread: focused, starred: !focused.starred)
-    Actions.queueTask(task)
+    if task
+      Actions.queueTask(task)
 
   _onArchive: ->
     @_archiveAndShiftBy('auto')