diff --git a/modules/UI/shared_video/SharedVideo.js b/modules/UI/shared_video/SharedVideo.js
index 064e2f0c5..8991de840 100644
--- a/modules/UI/shared_video/SharedVideo.js
+++ b/modules/UI/shared_video/SharedVideo.js
@@ -625,7 +625,7 @@ function SharedVideoThumb (url)
     this.videoSpanId = "sharedVideoContainer";
     this.container = this.createContainer(this.videoSpanId);
     this.container.onclick = this.videoClick.bind(this);
-
+    this.bindHoverHandler();
     SmallVideo.call(this, VideoLayout);
     this.isVideoMuted = true;
 }
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index e1f1357e3..bdf82c10e 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -471,7 +471,8 @@ SmallVideo.prototype.selectDisplayMode = function() {
  */
 SmallVideo.prototype._isHovered = function () {
     return this.videoIsHovered
-        || this.connectionIndicator.popover.popoverIsHovered;
+        || (this.connectionIndicator
+            && this.connectionIndicator.popover.popoverIsHovered);
 };
 
 /**