diff --git a/src/fs.rs b/src/fs.rs
index 6e5b2d788..e36731d95 100644
--- a/src/fs.rs
+++ b/src/fs.rs
@@ -749,6 +749,11 @@ impl<C: StaticFileConfig> StaticFiles<C> {
         if path.is_dir() {
             if let Some(redir_index) = C::index_file() {
                 path.push(redir_index);
+                if !path.exists() {
+                    path.pop();
+                    let dir = Directory::new(self.directory.clone(), path);
+                    return Ok(C::directory_listing(&dir, &req)?.into())
+                }
             } else if C::show_index() {
                 let dir = Directory::new(self.directory.clone(), path);
                 return Ok(C::directory_listing(&dir, &req)?.into())