diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 473b5d94798de556fcc4cc31cb1c6ac05ec3c3fb..fe1ff01bc251cb91c8a96967bfb1cfe588b4df77 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1653,13 +1653,16 @@ void LLPanelObjectInventory::updateInventory()
 		LLInventoryObject::object_list_t contents;
 		objectp->getInventoryContents(contents);
 
-		if (inventory_root && !contents.empty())
+		if (inventory_root)
 		{
 			reset();
+			mIsInventoryEmpty = contents.empty();
+			if (!mIsInventoryEmpty)
+			{
 
-			createFolderViews(inventory_root, contents);
-			mIsInventoryEmpty = FALSE;
-			mFolders->setEnabled(TRUE);
+				createFolderViews(inventory_root, contents);
+				mFolders->setEnabled(TRUE);
+			}
 		}
 		else
 		{