diff --git a/program/js/list.js b/program/js/list.js
index 33f88ab10..9f9e193e5 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -911,7 +911,8 @@ shift_select: function(id, control)
     from_rowIndex = this._rowIndex(this.rows[this.shift_start].obj),
     to_rowIndex = this._rowIndex(to_row.obj);
 
-  if (!to_row.expanded && to_row.has_children)
+  // if we're going down the list, and we hit a thread, and it's closed, select the whole thread
+  if (from_rowIndex < to_rowIndex && !to_row.expanded && to_row.has_children)
     if (to_row = this.rows[(this.row_children(id)).pop()])
       to_rowIndex = this._rowIndex(to_row.obj);
 
@@ -933,6 +934,7 @@ shift_select: function(id, control)
   }
 },
 
+
 /**
  * Helper method to emulate the rowIndex property of non-tr elements
  */