diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index a63fb73032017f2a40f3d8a91b1bb805f4d60e0b..b833c611bfb1633e5bdba67dea7b40018e21fe24 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1391,6 +1391,7 @@ void LLFolderView::startRenamingSelectedItem( void )
 		// set focus will fail unless item is visible
 		mRenamer->setFocus( TRUE );
 		mRenamer->setTopLostCallback(boost::bind(onRenamerLost, _1));
+		mRenamer->setFocusLostCallback(boost::bind(onRenamerLost, _1));
 		gFocusMgr.setTopCtrl( mRenamer );
 	}
 }