diff --git a/src/server/logic/Main.php b/src/server/logic/Main.php
index 65275a6..b5240e1 100644
--- a/src/server/logic/Main.php
+++ b/src/server/logic/Main.php
@@ -9,10 +9,13 @@ class Main {
     // - $appPath: E.g. '/slim-wiki'
     // - $requestPathArray: E.g. array('myfolder', 'mypage')
     public function dispatch($baseUrl, $appPath, $requestPathArray) {
-
         $articleBaseDir = realpath(__DIR__ . '/../../articles');
         $articleFilename = $articleBaseDir . '/' . implode('/', $requestPathArray);
 
+        if (is_dir($articleFilename)) {
+            $articleFilename = rtrim($articleFilename, '/') . '/index.md';
+        }
+
         if (($articleFilename == realpath($articleFilename)) && file_exists($articleFilename) && is_readable($articleFilename)) {
             $articleContent = file_get_contents($articleFilename);
             $articleMarkup = Parsedown::instance()->text($articleContent);