diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 04934b13f107569c6ce9f64e4cffef237998eb73..2caf186b70972709daa90b1f372dfb0f908e2fc6 100755
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -91,6 +91,7 @@ void LLPreview::setObjectID(const LLUUID& object_id)
 	{
 		loadAsset();
 	}
+	refreshFromItem();
 }
 
 void LLPreview::setItem( LLInventoryItem* item )
@@ -100,6 +101,7 @@ void LLPreview::setItem( LLInventoryItem* item )
 	{
 		loadAsset();
 	}
+	refreshFromItem();
 }
 
 const LLInventoryItem *LLPreview::getItem() const
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 26c46d543ca683ce38fdb009c95919d4d8aa285c..18bbf110f73c090d567d5a93c7e65458dbdbb543 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1879,7 +1879,7 @@ void LLLiveLSLEditor::loadAsset()
 			mIsModifiable = item && gAgent.allowOperation(PERM_MODIFY, 
 										item->getPermissions(),
 				   						GP_OBJECT_MANIPULATE);
-			refreshFromItem();
+
 			// This is commented out, because we don't completely
 			// handle script exports yet.
 			/*