diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 89fef2a7c3d929428bf585165e1535e9b5c6b893..f9664e0658549d35e4ec4c04b292c3b92b8c19f1 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -684,9 +684,10 @@ void LLFolderView::draw()
 		}
 	}
 
-	if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().contains(mRenamer->getRect()))
+	if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect()))
 	{
 		// renamer is not connected to the item we are renaming in any form so manage it manually
+		// TODO: consider stopping on any scroll action instead of when out of visible area
 		finishRenamingItem();
 	}