diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index 2d04c3919..92daa4e2b 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -161,6 +161,20 @@ private:
 	std::string mMarketplaceURL;
 };
 
+static void* createWebPanel(void* data)
+{
+	struct LLPanelDirWeb : public LLPanelDirFind
+	{
+		LLPanelDirWeb(LLFloaterDirectory* f) : LLPanelDirFind("web_panel", f, "web_search_browser") {}
+		/*virtual*/ void search(const std::string& url) {}
+		/*virtual*/ void navigateToDefaultPage()
+		{
+			if (mWebBrowser) mWebBrowser->navigateTo(getString("default_search_page"));
+		}
+	};
+	return new LLPanelDirWeb(static_cast<LLFloaterDirectory*>(data));
+}
+
 LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL;
 //static
 S32 LLFloaterDirectory::sOldSearchCount = 0; // debug
@@ -205,6 +219,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 		// web search and showcase only for SecondLife
 		factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this);
 		factory_map["showcase_panel"] = LLCallbackMap(createShowcase, this);		
+		if (!enableClassicAllSearch) factory_map["web_panel"] = LLCallbackMap(createWebPanel, this);
 	}
 
 	if (enableClassicAllSearch)
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory.xml b/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 32bd66d31..985895e50 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -696,6 +696,20 @@ To buy direct, visit the land and click on the place name in the title bar.
       <string name="done_text">Done</string>
       <string name="redirect_404_url">https://marketplace.secondlife.com/notfound</string>
       <string name="default_search_page">https://marketplace.secondlife.com/</string>
+    </panel>
+    <panel bottom="-549" follows="all" height="533" label="Web" left="1" mouse_opaque="false" name="web_panel" width="778">
+      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="go-reload.png"/>
+	  <button bottom_delta="0" follows="top|left" height="25" left_delta="27" width="200" label="Open Web Search Floater" name="web_search_floater_btn">
+		  <button.commit_callback function="Search.WebFloater"/>
+	  </button>
+      <web_browser name="web_search_browser" start_url="http://search.secondlife.com/" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
+      <text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
+      <string name="loading_text">Loading...</string>
+      <string name="done_text">Done</string>
+      <string name="redirect_404_url">http://search.secondlife.com/</string>
+      <string name="default_search_page">http://search.secondlife.com/</string>
     </panel>
 	</tab_container>
 	<panel bottom="-560" follows="right|top" height="470" left="340"