diff --git a/src/Images/Video.coffee b/src/Images/Video.coffee
new file mode 100644
index 000000000..6ee8ef4da
--- /dev/null
+++ b/src/Images/Video.coffee
@@ -0,0 +1,21 @@
+Video =
+  configure: (video, disableAutoplay) ->
+    video.loop = true
+    video.muted = !Conf['Allow Sound']
+    video.controls = Conf['Show Controls']
+    video.autoplay = false
+    if Conf['Autoplay'] and not disableAutoplay
+      Video.start video
+    else
+      video.pause()
+
+  start: (video) ->
+    {controls} = video
+    video.controls = false
+    video.play()
+    # Hacky workaround for Firefox forever-loading bug for very short videos
+    if controls
+      $.asap (-> (video.readyState >= 3 and video.currentTime <= Math.max 0.1, (video.duration - 0.5)) or !d.contains video), ->
+        video.controls = true
+      , 500
+