diff --git a/src/js/controller/LayersListController.js b/src/js/controller/LayersListController.js
index 5d62d1a7..a63470c0 100644
--- a/src/js/controller/LayersListController.js
+++ b/src/js/controller/LayersListController.js
@@ -31,6 +31,12 @@
     var layers = this.piskelController.getLayers();
     layers.forEach(this.addLayerItem.bind(this));
     this.updateButtonStatus_();
+
+    // Ensure the currently the selected layer is visible.
+    var currentLayerEl = this.layersListEl.querySelector('.current-layer-item');
+    if (currentLayerEl) {
+      currentLayerEl.scrollIntoView();
+    }
   };
 
   ns.LayersListController.prototype.initToggleLayerPreview_ = function () {