diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 8294977f9940f6003d884bf8b26715bd55500bac..f342dd9ce01c3b1163ac85d98ac299befd51a212 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -136,13 +136,11 @@ class LLPickHandler : public LLCommandHandler,
 	void createPick()
 	{
 		// open the new pick panel on the Picks floater
-		LLFloater* picks_floater = LLFloaterReg::showInstance("picks");
+        LLSD params;
+        params["open_tab_name"] = "panel_picks";
+        params["show_tab_panel"] = "create_classified";
 
-		LLPanelPicks* picks = picks_floater->findChild<LLPanelPicks>("panel_picks");
-		if (picks)
-		{
-			picks->createNewPick();
-		}
+        LLFloaterSidePanelContainer::showPanel("picks", params);
 	}
 
 	void editPick(LLPickData* pick_info)
@@ -261,13 +259,11 @@ class LLClassifiedHandler :
 	void createClassified()
 	{
 		// open the new classified panel on the Picks floater
-		LLFloater* picks_floater = LLFloaterReg::showInstance("picks");
+        LLSD params;
+        params["open_tab_name"] = "panel_picks";
+        params["show_tab_panel"] = "create_pick";
 
-		LLPanelPicks* picks = picks_floater->findChild<LLPanelPicks>("panel_picks");
-		if (picks)
-		{
-			picks->createNewClassified();
-		}
+        LLFloaterSidePanelContainer::showPanel("picks", params);
 	}
 
 	void openClassified(LLAvatarClassifiedInfo* c_info)