diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 2148c4c37..8e36725c8 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1571,7 +1571,7 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 		{
 			LLFolderViewItem* last_selected = getCurSelectedItem();
 			bool shift_select = mask & MASK_SHIFT;
-			LLFolderViewItem* next = NULL;
+			LLFolderViewItem* next = last_selected->getNextOpenNode();
 
 			if (!mKeyboardSelection || (!shift_select && (!next || next == last_selected)))
 			{