diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99540952..795511d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -162,6 +162,7 @@
   * Handling of files on the printer's SD card contained in folders now works correctly
   * Don't display a "Disconnected" screen when trying to download a timelapse in Firefox
   * Fixed handling of SD card files in folders
+  * Fixed refreshing of timelapse file list upon finished rendering of a new one
 
 ([Commits](https://github.com/foosel/OctoPrint/compare/master...devel))
 
diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js
index 6be7c754..b6170d45 100644
--- a/src/octoprint/static/js/app/dataupdater.js
+++ b/src/octoprint/static/js/app/dataupdater.js
@@ -176,7 +176,6 @@ function DataUpdater(allViewModels) {
                         new PNotify({title: gettext("Rendering timelapse"), text: _.sprintf(gettext("Now rendering timelapse %(movie_basename)s"), payload)});
                     } else if (type == "MovieDone") {
                         new PNotify({title: gettext("Timelapse ready"), text: _.sprintf(gettext("New timelapse %(movie_basename)s is done rendering."), payload)});
-                        timelapseViewModel.requestData();
                     } else if (type == "MovieFailed") {
                         html = "<p>" + _.sprintf(gettext("Rendering of timelapse %(movie_basename)s failed with return code %(returncode)s"), payload) + "</p>";
                         html += pnotifyAdditionalInfo('<pre style="overflow: auto">' + payload.error + '</pre>');
diff --git a/src/octoprint/static/js/app/viewmodels/timelapse.js b/src/octoprint/static/js/app/viewmodels/timelapse.js
index f3f8abcc..ed4188b5 100644
--- a/src/octoprint/static/js/app/viewmodels/timelapse.js
+++ b/src/octoprint/static/js/app/viewmodels/timelapse.js
@@ -174,6 +174,10 @@ $(function() {
             self.requestData();
         };
 
+        self.onEventMovieDone = function(payload) {
+            self.requestData();
+        };
+
         self.onStartup = function() {
             self.requestData();
         };