diff --git a/js/expand-video.js b/js/expand-video.js
index 6d04b858..6412bc3e 100644
--- a/js/expand-video.js
+++ b/js/expand-video.js
@@ -13,7 +13,7 @@ function setupVideo(thumb, url) {
     var videoContainer, videoHide;
     var expanded = false;
     var hovering = false;
-    var loop = true;
+    var loop = setting("videoloop");
     var loopControls = [document.createElement("span"), document.createElement("span")];
     var fileInfo = thumb.parentNode.querySelector(".fileinfo");
     var mouseDown = false;
@@ -192,7 +192,7 @@ function setupVideo(thumb, url) {
 
     loopControls[0].textContent = _("[play once]");
     loopControls[1].textContent = _("[loop]");
-    loopControls[1].style.fontWeight = "bold";
+    loopControls[(setting("videoloop") ? 1 : 0)].style.fontWeight = "bold";
     for (var i = 0; i < 2; i++) {
         setupLoopControl(i);
         loopControls[i].style.whiteSpace = "nowrap";
diff --git a/js/webm-settings.js b/js/webm-settings.js
index bd3c6f0f..966e630e 100644
--- a/js/webm-settings.js
+++ b/js/webm-settings.js
@@ -8,7 +8,8 @@ if (typeof _ == 'undefined') {
 var defaultSettings = {
     "videoexpand": true,
     "videohover": false,
-    "videovolume": 1.0
+    "videovolume": 1.0,
+    "videoloop": true
 };
 
 // Non-persistent settings for when localStorage is absent/disabled
@@ -53,6 +54,7 @@ settingsMenu.innerHTML = prefix
     + '<div style="'+style+'">'
     + '<label><input type="checkbox" name="videoexpand">'+_('Expand videos inline')+'</label><br>'
     + '<label><input type="checkbox" name="videohover">'+_('Play videos on hover')+'</label><br>'
+    + '<label><input type="checkbox" name="videoloop">'+_('Loop videos by default')+'</label><br>'
     + '<label><input type="range" name="videovolume" min="0" max="1" step="0.01" style="width: 4em; height: 1ex; vertical-align: middle; margin: 0px;">'+_('Default volume')+'</label><br>'
     + suffix;
 
diff --git a/js/webm/playersettings.js b/js/webm/playersettings.js
index 861d27c2..174f378c 100644
--- a/js/webm/playersettings.js
+++ b/js/webm/playersettings.js
@@ -24,5 +24,6 @@ if (window.addEventListener) window.addEventListener("load", function(e) {
 
     video.muted = (setting("videovolume") == 0);
     video.volume = setting("videovolume");
+    video.loop = (setting("videoloop") == 1)
     video.play();
 }, false);