1 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 49ca5e4..b543e31 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -40,7 +40,7 @@
 #include "llfocusmgr.h"
 #include "llfontgl.h"
 #include "llgl.h" 
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llinventory.h"
 
 #include "llcallbacklist.h"
@@ -3144,6 +3144,10 @@ void LLFolderView::draw()
         {
                 closeAutoOpenedFolders();
         }
+        if(gViewerWindow->hasKeyboardFocus(this) && !getVisible())
+        {
+                gViewerWindow->setKeyboardFocus( NULL );
+        }
 
         // while dragging, update selection rendering to reflect single/multi drag status
         if (LLToolDragAndDrop::getInstance()->hasMouseCapture())