diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index ed46ee78b..95d81027d 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -358,7 +358,8 @@ LLFloaterMarketplaceListings::LLFloaterMarketplaceListings(const LLSD& key)
 , mPanelListingsSet(false)
 {
 	//buildFromFile("floater_marketplace_listings.xml");
-	LLUICtrlFactory::instance().buildFloater(this, "floater_marketplace_listings.xml");
+	mFactoryMap["panel_marketplace_listing"] = LLCallbackMap([&](void*) { return mPanelListings = new LLPanelMarketplaceListings; });
+	LLUICtrlFactory::instance().buildFloater(this, "floater_marketplace_listings.xml", &getFactoryMap());
 }
 
 LLFloaterMarketplaceListings::~LLFloaterMarketplaceListings()
@@ -384,8 +385,6 @@ BOOL LLFloaterMarketplaceListings::postBuild()
 	mInventoryText = mInventoryPlaceholder->getChild<LLTextBox>("marketplace_listings_inventory_placeholder_text");
 	mInventoryTitle = mInventoryPlaceholder->getChild<LLTextBox>("marketplace_listings_inventory_placeholder_title");
 
-	mPanelListings = static_cast<LLPanelMarketplaceListings*>(getChild<LLUICtrl>("panel_marketplace_listing"));
-
 	LLFocusableElement::setFocusReceivedCallback(boost::bind(&LLFloaterMarketplaceListings::onFocusReceived, this));
 
 	// Observe category creation to catch marketplace listings creation (moot if already existing)
diff --git a/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml
index cb70221b1..1839de5c2 100644
--- a/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml
@@ -67,7 +67,7 @@
       <panel
         name="panel_marketplace_listing"
         filename="panel_marketplace_listings.xml"
-        bottom="-5"
+        bottom="-435"
         follows="all"/>
       </panel>
     <panel
diff --git a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml
index 9cbc928db..a293bcb02 100644
--- a/indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml
@@ -5,7 +5,6 @@
   follows="all"
   layout="topleft"
   width="308"
-  class="llpanelmarketplacelistings"
   height="440">
   <panel
     name="tool_panel"