diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index fe458a4d0..d570e3892 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -158,7 +158,10 @@ Gallery =
       $.extend  file.dataset,   @dataset
       nodes.current.pause?()
       $.replace nodes.current,  file
-      Video.configure file if elType is 'video'
+      if elType is 'video'
+        file.loop = true
+        file.controls = Conf['Show Controls']
+        Video.start file if Conf['Autoplay']
       nodes.count.textContent = +@dataset.id + 1
       nodes.current           = file
       nodes.frame.scrollTop   = 0
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 1a365d799..041ecb1ce 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -153,7 +153,10 @@ ImageExpand =
     post.file.isExpanded = true
     if post.file.isVideo
       ImageExpand.setupVideoControls post
-      Video.configure post.file.fullImage, disableAutoplay
+      video = post.file.fullImage
+      video.loop = true
+      video.controls = Conf['Show Controls']
+      Video.start video if Conf['Autoplay'] and not disableAutoplay
 
   videoCB: do ->
     # dragging to the left contracts the video
diff --git a/src/Images/Video.coffee b/src/Images/Video.coffee
index 97512600c..3215c5f0c 100644
--- a/src/Images/Video.coffee
+++ b/src/Images/Video.coffee
@@ -1,13 +1,4 @@
 Video =
-  configure: (video, disableAutoplay) ->
-    video.loop = true
-    video.controls = Conf['Show Controls']
-    video.autoplay = false
-    if Conf['Autoplay'] and not disableAutoplay
-      Video.start video
-    else
-      video.pause()
-
   start: (video) ->
     return unless video.paused
     {controls} = video