diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
index e788a5f1ac..3418e59711 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
@@ -91,8 +91,16 @@
 				BindingUtils.bindSetter(updateButtons, viewingStreamInd, "visible");
 			}
 
+			override public function set data(value:Object):void {
+				//reset rolledOver when the data changes because onRollOut wont be called if the row moves
+				if (data == null || value == null || data.userId != value.userId) {
+					rolledOver = false;
+				}
+				
+				super.data = value;
+			}
+			
 			private function dataChangeHandler(e:Event):void {
-				//rest rolledOver when the data changes because onRollOut wont be called if the row moves
 				if (data != null) {
 					updateButtons();
 					validateNow();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
index 95f897cf8b..9231c05204 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
@@ -84,6 +84,15 @@
   				validateNow();
   			}
   			
+			override public function set data(value:Object):void {
+				//reset rolledOver when the data changes because onRollOut wont be called if the row moves
+				if (data == null || value == null || data.userId != value.userId) {
+					rolledOver = false;
+				}
+				
+				super.data = value;
+			}
+			
   			private function dataChangeHandler(e:Event):void {
   				if (data != null) {
   					updateButtons(); //reassess data state on change