diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 8e5f4332e..02a564319 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -156,7 +156,9 @@ ImageExpand =
     if file.fullImage
       # Expand already-loaded/ing picture.
       TrashQueue.remove el
-      el.src = el.src if /\.gif$/.test el.src and !file.isHovered
+      unless file.isHovered
+        el.src = el.src if /\.gif$/.test el.src
+        el.currentTime = 0 if isVideo
     else
       el.src = src or file.URL
       $.after thumb, el
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index fb0ec4264..26068d21a 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -18,6 +18,7 @@ ImageHover =
       el.id = 'ihover'
       TrashQueue.remove el
       el.src = el.src if /\.gif$/.test el.src
+      el.currentTime = 0 if isVideo
     else
       file.fullImage = el = $.el (if isVideo then 'video' else 'img'),
         className: 'full-image'