diff --git a/react/features/filmstrip/components/web/Thumbnail.js b/react/features/filmstrip/components/web/Thumbnail.js
index 2d05b77e5562..26ed5c6aef86 100644
--- a/react/features/filmstrip/components/web/Thumbnail.js
+++ b/react/features/filmstrip/components/web/Thumbnail.js
@@ -827,10 +827,7 @@ class Thumbnail extends Component<Props, State> {
         const { _gifSrc, classes } = this.props;
 
         return _gifSrc && (
-            <div
-                className = { classes.gif }
-                onMouseEnter = { this._onGifMouseEnter }
-                onMouseLeave = { this._onGifMouseLeave }>
+            <div className = { classes.gif }>
                 <img
                     alt = 'GIF'
                     src = { _gifSrc } />
@@ -1000,6 +997,12 @@ class Thumbnail extends Component<Props, State> {
                     className = { clsx(classes.borderIndicator,
                     _gifSrc && classes.borderIndicatorOnTop,
                     'active-speaker-indicator') } />
+                {_gifSrc && (
+                    <div
+                        className = { clsx(classes.borderIndicator, classes.borderIndicatorOnTop) }
+                        onMouseEnter = { this._onGifMouseEnter }
+                        onMouseLeave = { this._onGifMouseLeave } />
+                )}
             </span>
         );
     }