diff --git a/indra/newview/llfloatermarketplace.cpp b/indra/newview/llfloatermarketplace.cpp
index d626786591..a8615e82a3 100644
--- a/indra/newview/llfloatermarketplace.cpp
+++ b/indra/newview/llfloatermarketplace.cpp
@@ -47,8 +47,10 @@ void LLFloaterMarketplace::onClose(bool app_quitting)
 bool LLFloaterMarketplace::postBuild()
 {
     LLFloaterWebContent::postBuild();
-    mWebBrowser = getChild<LLMediaCtrl>("marketplace_contents");
-    mWebBrowser->addObserver(this);
+    // <FS:Ansariel> Already set in LLFloaterWebContent
+    //mWebBrowser = getChild<LLMediaCtrl>("marketplace_contents");
+    //mWebBrowser->addObserver(this);
+    // </FS:Ansariel>
     mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
     std::string url = gSavedSettings.getString("MarketplaceURL");
     mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
diff --git a/indra/newview/skins/default/xui/de/floater_marketplace.xml b/indra/newview/skins/default/xui/de/floater_marketplace.xml
index a7ab7144a2..fadcd107bd 100644
--- a/indra/newview/skins/default/xui/de/floater_marketplace.xml
+++ b/indra/newview/skins/default/xui/de/floater_marketplace.xml
@@ -10,5 +10,17 @@
 			<icon name="media_secure_lock_flag" tool_tip="Sicheres Browsen"/>
 			<button name="popexternal" tool_tip="Aktuelle URL im Desktop-Browser öffnen"/>
 		</layout_panel>
+		<layout_panel name="external_controls">
+			<text name="plugin_fail_text">
+Das Web-Browser-Plugin lädt gerade.
+Sollte das Plugin nicht laden, sind Informationen zur Problemlösung erhältlich unter
+
+https://wiki.firestormviewer.org/fs_search_issues
+
+und
+
+https://wiki.firestormviewer.org/fs_media
+			</text>
+		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace.xml b/indra/newview/skins/default/xui/en/floater_marketplace.xml
index b3bea48600..4c64ee3bc6 100644
--- a/indra/newview/skins/default/xui/en/floater_marketplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace.xml
@@ -164,12 +164,32 @@
       top_delta="0"
       auto_resize="true"
       width="585">
+      <text
+        name="plugin_fail_text"
+        follows="all"
+        layout="topleft"
+        left="60"
+        top="60"
+        right="-60"
+        bottom="-60"
+        wrap="true">
+The web browser plugin seems to be taking a while to open.
+If the plugin never loads, please visit:
+
+https://wiki.firestormviewer.org/fs_search_issues
+
+and
+
+https://wiki.firestormviewer.org/fs_media
+
+for possible steps to resolve this issue.
+      </text>
       <web_browser
         bottom="-2"
         follows="all"
         layout="topleft"
         left="0"
-        name="marketplace_contents"
+        name="webbrowser"
         top="0"/>
     </layout_panel>
     <layout_panel name="status_bar" 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8311d044ab..ead4619e94 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -326,7 +326,7 @@
          left_pad="10"
          top_delta="-4"
          name="mouse_warp_combo"
-         tooltip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look."
+         tool_tip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look."
          width="100">
          <combo_box.item
           label="Automatic"