1 files changed, 9 insertions, 1 deletions
diff --git a/lib/nodeserver/server.js b/lib/nodeserver/server.js
index 54ae78fc..5f85b368 100644
--- a/lib/nodeserver/server.js
+++ b/lib/nodeserver/server.js
@@ -107,7 +107,15 @@ StaticServlet.prototype.handleRequest = function(req, res) {
     if (err)
       return self.sendMissing_(req, res, path);
     if (stat.isDirectory())
-      return self.sendDirectory_(req, res, path);
+      return fs.stat(path + 'index.html', function(err, stat) {
+        // send index.html if exists
+        if (!err)
+          return self.sendFile_(req, res, path + 'index.html');
+
+        // list files otherwise
+        return self.sendDirectory_(req, res, path);
+      });
+
     return self.sendFile_(req, res, path);
   });
 };