diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 0bdad791a7e2fb2dfefa8522e47719e9e35c6289..082b7a94689b8fcb872848f00c8f4611d0f28bbe 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -402,9 +402,12 @@ void LLInventoryPanel::modelChanged(U32 mask)
 // static
 void LLInventoryPanel::onIdle(void *userdata)
 {
+	if (!gInventory.isInventoryUsable())
+		return;
+
 	LLInventoryPanel *self = (LLInventoryPanel*)userdata;
 	// Inventory just initialized, do complete build
-	if (!self->mViewsInitialized && gInventory.isInventoryUsable())
+	if (!self->mViewsInitialized)
 	{
 		self->initializeViews();
 	}