diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f0664c78b9..fcb1cc5f73 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1560,7 +1560,14 @@ void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
 		{
 			menu->setVisible(FALSE);
 		}
-		getActivePanel()->getRootFolder()->finishRenamingItem();
+		// <FS:Ansariel> FIRE-20109: Crash at start using Vintage skin
+		//getActivePanel()->getRootFolder()->finishRenamingItem();
+		LLInventoryPanel* panel = getActivePanel();
+		if (panel)
+		{
+			panel->getRootFolder()->finishRenamingItem();
+		}
+		// </FS:Ansariel>
 	}
 }