diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 95407d2364356e24a4368b58480fbea114cb977f..89c7e0d14a7a375c1c86553e76c86bc457903da3 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -711,12 +711,17 @@ void LLFolderViewItem::drawHighlight(const BOOL showContent, const BOOL hasKeybo
                 bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, 0.f, bg_color.mV[VALPHA]);
             }
         }
-        gl_rect_2d(FOCUS_LEFT,
-            focus_top, 
-            getRect().getWidth() - 2,
-            focus_bottom,
-            bg_color, hasKeyboardFocus);
-        if (isHighlightActive())
+
+        if (!isHighlightAllowed() || isHighlightActive())
+        {
+        	gl_rect_2d(FOCUS_LEFT,
+                focus_top,
+                getRect().getWidth() - 2,
+                focus_bottom,
+                bg_color, hasKeyboardFocus);
+        }
+
+        if (mIsCurSelection)
         {
             gl_rect_2d(FOCUS_LEFT, 
                 focus_top,