1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index b65480b..52bd0f7 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -128,8 +128,11 @@ void LLPanelDirBrowser::draw()
                         LLCtrlListInterface *list = childGetListInterface("results");
                         if (list)
                         {
-                                list->selectFirstItem(); // select first item by default
-                                childSetFocus("results", TRUE);
+                                if (list->getCanSelect())
+                                {
+                                        list->selectFirstItem(); // select first item by default
+                                        childSetFocus("results", TRUE);
+                                }
                                 // Request specific data from the server
                                 onCommitList(NULL, this);
                         }