diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index a244c8d28184510df3621beb43b0a0ec6bf70419..ca8533abc59c410de3aea71ab8459d57502a4d6e 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -45,6 +45,7 @@ LLFloaterWebContent::LLFloaterWebContent( const LLSD& key )
 	mCommitCallbackRegistrar.add( "WebContent.Back", boost::bind( &LLFloaterWebContent::onClickBack, this ));
 	mCommitCallbackRegistrar.add( "WebContent.Forward", boost::bind( &LLFloaterWebContent::onClickForward, this ));
 	mCommitCallbackRegistrar.add( "WebContent.Reload", boost::bind( &LLFloaterWebContent::onClickReload, this ));
+	mCommitCallbackRegistrar.add( "WebContent.Stop", boost::bind( &LLFloaterWebContent::onClickStop, this ));
 	mCommitCallbackRegistrar.add( "WebContent.EnterAddress", boost::bind( &LLFloaterWebContent::onEnterAddress, this ));
 	mCommitCallbackRegistrar.add( "WebContent.PopExternal", boost::bind( &LLFloaterWebContent::onPopExternal, this ));
 }
@@ -338,7 +339,13 @@ void LLFloaterWebContent::onClickReload()
 void LLFloaterWebContent::onClickStop()
 {
 	if( mWebBrowser->getMediaPlugin() )
-		mWebBrowser->getMediaPlugin()->stop();
+		mWebBrowser->getMediaPlugin()->browse_stop();
+
+	// still should happen when we catch the navigate complete event
+	// but sometimes (don't know why) that event isn't sent from Qt
+	// and we getto a point where the stop button stays active.
+	getChildView("reload")->setVisible( true );
+	getChildView("stop")->setVisible( false );
 }
 
 void LLFloaterWebContent::onEnterAddress()
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 34462d75483b9fa0418284a2a22d27602078e5a3..2ad46824c25def60bfef10ca725e16947a4184c4 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -75,7 +75,7 @@
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
         tool_tip="Stop navigation"
-        enabled="false"
+        enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"