diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 597ecc058947eb240dd6541f575910f21484ed92..c4f3866cad95386478d35f5739504185f82a9e2f 100755
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -158,7 +158,14 @@ class LLPickHandler : public LLCommandHandler,
 		}
 
 		// open the edit side tray for this pick
-		editPick(pick_info);
+		if (pick_info->creator_id == gAgent.getID())
+		{
+			editPick(pick_info);
+		}
+		else
+		{
+			llwarns << "Can't edit a pick you did not create" << llendl;
+		}
 
 		// remove our observer now that we're done
 		mPickIds.erase(pick_info->pick_id);
@@ -254,14 +261,21 @@ class LLClassifiedHandler :
 		}
 		else if (mRequestVerb == "edit")
 		{
-			llwarns << "edit in progress" << llendl;
-			// open the new classified panel on the Me > Picks sidetray
-			LLSD params;
-			params["id"] = gAgent.getID();
-			params["open_tab_name"] = "panel_picks";
-			params["show_tab_panel"] = "edit_classified";
-			params["classified_id"] = c_info->classified_id;
-			LLSideTray::getInstance()->showPanel("panel_me", params);
+			if (c_info->creator_id == gAgent.getID())
+			{
+				llwarns << "edit in progress" << llendl;
+				// open the new classified panel on the Me > Picks sidetray
+				LLSD params;
+				params["id"] = gAgent.getID();
+				params["open_tab_name"] = "panel_picks";
+				params["show_tab_panel"] = "edit_classified";
+				params["classified_id"] = c_info->classified_id;
+				LLSideTray::getInstance()->showPanel("panel_me", params);
+			}
+			else
+			{
+				llwarns << "Can't edit a classified you did not create" << llendl;
+			}
 		}
 	}