diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 3ffa08ec325b86bf68717304bc4f703e8318087e..d4080ab3f7f29574a9b517b38426fbd2beceaf7f 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -2235,14 +2235,9 @@ void LLFolderView::doIdle()
 		arrangeAll();
 	}
 
-	mNeedsAutoSelect = mFilter->hasFilterString() &&
-							!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
-
-		
-	if (mFilter->isModified() && mFilter->isNotDefault())
-	{
-		mNeedsAutoSelect = TRUE;
-	}
+	BOOL filter_modified_and_active = mFilter->isModified() && mFilter->isNotDefault();
+	mNeedsAutoSelect = filter_modified_and_active &&
+						!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
 	mFilter->clearModified();
 			
 	// filter to determine visibility before arranging