diff --git a/code/constants.php b/code/constants.php
index 112e6b7..db1b024 100644
--- a/code/constants.php
+++ b/code/constants.php
@@ -1,5 +1,13 @@
 <?php
 
+
 // Serve always hosts from the root
 define('BASE_URL', '');
-define('BASE_PATH', getcwd());
+
+// Detect BASE_PATH with public-folder awareness
+define(
+    'BASE_PATH',
+    basename(getcwd()) === 'public'
+        ? dirname(getcwd())
+        : getcwd()
+);
diff --git a/code/server-handler.php b/code/server-handler.php
index 689721d..84e2866 100644
--- a/code/server-handler.php
+++ b/code/server-handler.php
@@ -29,6 +29,7 @@
 
 
 $paths = [
+    '/public/index.php',
     '/index.php',
     '/vendor/silverstripe/framework/main.php',
     '/framework/main.php',