diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 173ff8d68b..75b25b6a40 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -135,7 +135,6 @@ BOOL LLPanelNearByMedia::postBuild()
 	mMediaList = getChild<LLScrollListCtrl>("media_list");
 	mEnableAllCtrl = getChild<LLUICtrl>("all_nearby_media_enable_btn");
 	mDisableAllCtrl = getChild<LLUICtrl>("all_nearby_media_disable_btn");
-	mItemCountText = getChild<LLTextBox>("media_item_count");
 	mShowCtrl = getChild<LLComboBox>("show_combo");
 
 	// Dynamic (selection-dependent) controls
@@ -232,6 +231,7 @@ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
 const F32 AUTO_CLOSE_FADE_TIME_START= 4.0f;
 const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f;
 
+/*virtual*/
 void LLPanelNearByMedia::draw()
 {
 	//LLUICtrl* new_top = gFocusMgr.getTopCtrl();
@@ -250,8 +250,6 @@ void LLPanelNearByMedia::draw()
 		setShape(new_rect);
 	}
 
-	mItemCountText->setValue(llformat(getString("media_item_count_format").c_str(), mMediaList->getItemCount()));
-	
 	refreshList();
 	updateControls();
 	
@@ -268,6 +266,21 @@ void LLPanelNearByMedia::draw()
 	}
 }
 
+/*virtual*/
+BOOL LLPanelNearByMedia::handleHover(S32 x, S32 y, MASK mask)
+{
+	LLPanel::handleHover(x, y, mask);
+	
+	// If we are hovering over this panel, make sure to clear any hovered media
+	// ID.  Note that the more general solution would be to clear this ID when
+	// the mouse leaves the in-scene view, but that proved to be problematic.
+	// See EXT-5517
+	LLViewerMediaFocus::getInstance()->clearHover();
+		
+	// Always handle
+	return true;
+}
+
 bool LLPanelNearByMedia::getParcelAudioAutoStart()
 {
 	return mParcelAudioAutoStart;
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
index 6fe724266b..4f864519f5 100644
--- a/indra/newview/llpanelnearbymedia.h
+++ b/indra/newview/llpanelnearbymedia.h
@@ -56,6 +56,7 @@ public:
 	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
 	/*virtual*/ void onTopLost ();
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
 
 	// this is part of the nearby media *dialog* so we can track whether
 	// the user *implicitly* wants audio on or off via their *explicit*
@@ -149,7 +150,6 @@ private:
 	void onClickSelectedMediaUnzoom();
 	
 	LLUICtrl*			mNearbyMediaPanel;
-	LLTextBox*			mItemCountText;
 	LLScrollListCtrl*		mMediaList;
 	LLUICtrl*			mEnableAllCtrl;
 	LLUICtrl*			mDisableAllCtrl;
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
index ec2ad42fa1..2d97a25fa9 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		(%ls Medien-Objekte)
-	</string>
 	<string name="empty_item_text">
 		&lt;leer&gt;
 	</string>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 0f911f789e..7c0ce9e62e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,23 +2,23 @@
 <panel
 	can_resize="true"
 	can_close="false"
- bg_opaque_image="Volume_Background" 
- bg_alpha_image="Volume_Background" 
-  background_opaque="true"
+	mouse_opaque="true"
+	bg_opaque_image="Volume_Background" 
+	bg_alpha_image="Volume_Background" 
+	background_opaque="true"
 	background_visible="true"
 	layout="topleft"
 	width="270"
 	height="235"
 	name="nearby_media"
 	help_topic="nearby_media">
-  <string name="media_item_count_format">(%ld media items)</string>
   <string name="empty_item_text">&lt;empty&gt;</string>
   <string name="parcel_media_name">Parcel Streaming Media</string>
   <string name="parcel_audio_name">Parcel Streaming Audio</string>
   <string name="playing_suffix">(playing)</string>
   <panel
 	  bevel_style="in"
-    background_visible="false" 
+	  background_visible="false" 
 	  follows="left|right|top"
 	  top="0"
 	  height="30"
@@ -98,20 +98,6 @@
 		width="100">
 	  Nearby Media
 	</text>
-	<!-- nix for now
-		 <text
-		 bottom_delta="1"
-		 type="string"
-		 follows="top|left|right"
-		 font="SansSerif"
-		 font.style="ITALIC"
-		 font.size="Small"
-		 name="media_item_count"
-		 left="115"
-		 right="-10">
-		 (?? media items)
-		 </text>
-	-->
 	<text
 		type="string"
 		length="1"
@@ -147,6 +133,7 @@
 		  ame="OnOthers" />
 	</combo_box>
 	<scroll_list
+		name="media_list"
 		follows="left|top|bottom|right"
 		column_padding="0"
 		height="105"
@@ -155,8 +142,7 @@
 		bg_stripe_color="0.25 0.25 0.25 0.25"
 		top_pad="8"
 		left="10"
-		right="-10"
-		name="media_list">
+		right="-10">
 	  <scroll_list.columns
 		  type="checkbox"
 		  width="-1"
@@ -204,11 +190,9 @@
 		  left="10"
 		  right="-10"
 		  border_size="0"
-		  mouse_opaque="false"
 		  orientation="horizontal">
 		<layout_panel
 			name="stop"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -236,7 +220,6 @@
 		</layout_panel>
 		<layout_panel
 			name="play"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -264,7 +247,6 @@
 		</layout_panel>
 		<layout_panel
 			name="pause"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -291,7 +273,6 @@
 		</layout_panel>
 		<layout_panel
 			name="volume_slider_ctrl"
-			mouse_opaque="false"
 			auto_resize="true"
 			user_resize="false"
 			follows="left|right"
@@ -316,7 +297,6 @@
 		</layout_panel>
 		<layout_panel
 			name="mute"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -345,7 +325,6 @@
 		</layout_panel>
 		<layout_panel
 			name="zoom"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -373,7 +352,6 @@
 		</layout_panel>
 		<layout_panel
 			name="unzoom"
-			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false"
 			layout="topleft"
@@ -402,7 +380,6 @@
 		<layout_panel
 			name="right_bookend"
 			width="0"
-			mouse_opaque="false"
 			user_resize="false" />
 	  </layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 53b9bc6f82..71e65232aa 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		(%ld articles de média)
-	</string>
 	<string name="empty_item_text">
 		&lt;vide&gt;
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index ca93d46e4d..a670975dda 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
-	<string name="media_item_count_format">
-		（メディアアイテム %ld ）
-	</string>
 	<string name="empty_item_text">
 		&lt;空&gt;
 	</string>