diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 5d25f6697..8e5f4332e 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -156,6 +156,7 @@ ImageExpand =
     if file.fullImage
       # Expand already-loaded/ing picture.
       TrashQueue.remove el
+      el.src = el.src if /\.gif$/.test el.src and !file.isHovered
     else
       el.src = src or file.URL
       $.after thumb, el
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 610a0e273..fb0ec4264 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -12,10 +12,12 @@ ImageHover =
     post = Get.postFromNode @
     {file} = post
     {isVideo} = file
-    return if post.file.isExpanding or post.file.isExpanded
+    return if file.isExpanding or file.isExpanded
+    file.isHovered = true
     if el = file.fullImage
       el.id = 'ihover'
       TrashQueue.remove el
+      el.src = el.src if /\.gif$/.test el.src
     else
       file.fullImage = el = $.el (if isVideo then 'video' else 'img'),
         className: 'full-image'
@@ -39,6 +41,7 @@ ImageHover =
           el.pause()
           TrashQueue.add el, post
         el.removeAttribute 'id'
+        $.queueTask -> delete file.isHovered
   error: ->
     post = Get.postFromNode @
     return if post.file.isExpanding or post.file.isExpanded