diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp
index 446e54b4fb..4e4263cdb3 100644
--- a/indra/newview/fsfloatersearch.cpp
+++ b/indra/newview/fsfloatersearch.cpp
@@ -279,7 +279,13 @@ void FSFloaterSearch::onOpen(const LLSD& key)
 	Params p(key);
 	mPanelWeb->loadURL(p.search);
 	if (key.has("query"))
+	{
 		mTabContainer->selectTabPanel(mPanelWeb);
+	}
+	else if (key.has("tab") && key["tab"].asString() == "groups")
+	{
+		mTabContainer->selectTabPanel(mPanelGroups);
+	}
 }
 
 //virtual
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 32513fe9b8..1eab89fe04 100755
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -217,7 +217,10 @@ LLFetchLeaveGroupData* gFetchLeaveGroupData = NULL;
 // static
 void LLGroupActions::search()
 {
-	LLFloaterReg::showInstance("search", LLSD().with("category", "groups"));
+	// <FS:Ansariel> Open groups search panel instead of invoking presumed failed websearch
+	//LLFloaterReg::showInstance("search", LLSD().with("category", "groups"));
+	LLFloaterReg::showInstance("search", LLSD().with("tab", "groups"));
+	// </FS:Ansariel>
 }
 
 // static