diff --git a/frontend/src/pages/library/index.vue b/frontend/src/pages/library/index.vue
index f481c587d..bdfa042ff 100644
--- a/frontend/src/pages/library/index.vue
+++ b/frontend/src/pages/library/index.vue
@@ -163,6 +163,12 @@
                 const type = ev.split('.')[1];
 
                 switch (type) {
+                    case "folder":
+                        this.action = this.$gettext("Indexing");
+                        this.busy = true;
+                        this.completed = 0;
+                        this.fileName = data.filePath;
+                        break;
                     case "indexing":
                         this.action = this.$gettext("Indexing");
                         this.busy = true;
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 2e1f75fb6..1bf01ecdf 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -135,7 +135,7 @@ export default [
         path: "/folders",
         component: Albums,
         meta: {title: $gettext("Folders"), auth: true},
-        props: {view: "folder", staticFilter: {type: "folder"}},
+        props: {view: "folder", staticFilter: {type: "folder", order: "slug"}},
     },
     {
         name: "folder",
diff --git a/internal/photoprism/index.go b/internal/photoprism/index.go
index 4ea3cf083..ad7867dd1 100644
--- a/internal/photoprism/index.go
+++ b/internal/photoprism/index.go
@@ -142,6 +142,12 @@ func (ind *Index) Start(opt IndexOptions) fs.Done {
 					}
 				}
 
+				if isDir {
+					event.Publish("index.folder", event.Data{
+						"filePath": relName,
+					})
+				}
+
 				return result
 			}