diff --git a/drivers/StatamicValetDriver.php b/drivers/StatamicValetDriver.php
index 235b404..e6384db 100644
--- a/drivers/StatamicValetDriver.php
+++ b/drivers/StatamicValetDriver.php
@@ -54,6 +54,18 @@ public function frontControllerPath($sitePath, $siteName, $uri)
 
         $_SERVER['SCRIPT_NAME'] = '/index.php';
 
+        if (strpos($_SERVER['REQUEST_URI'], '/index.php') === 0) {
+            $_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 10);
+        }
+
+        if ($uri === '') {
+            $uri = '/';
+        }
+
+        if ($uri === '/installer.php') {
+            return $sitePath.'/installer.php';
+        }
+
         if (file_exists($indexPath = $sitePath.'/index.php')) {
             return $indexPath;
         }
diff --git a/drivers/ValetDriver.php b/drivers/ValetDriver.php
index a114bf5..f1e1bdd 100644
--- a/drivers/ValetDriver.php
+++ b/drivers/ValetDriver.php
@@ -45,10 +45,10 @@ public static function assign($sitePath, $siteName, $uri)
         $drivers = static::driversIn(VALET_HOME_PATH.'/Drivers');
 
         $drivers[] = 'LaravelValetDriver';
-        $drivers[] = 'StatamicValetDriver';
-        $drivers[] = 'JigsawValetDriver';
         $drivers[] = 'WordPressValetDriver';
         $drivers[] = 'CraftValetDriver';
+        $drivers[] = 'StatamicValetDriver';
+        $drivers[] = 'JigsawValetDriver';
         $drivers[] = 'StaticValetDriver';
 
         foreach ($drivers as $driver) {
diff --git a/server.php b/server.php
index 6dd1967..5a2940d 100644
--- a/server.php
+++ b/server.php
@@ -74,7 +74,15 @@ function show_valet_404()
  */
 $uri = $valetDriver->mutateUri($uri);
 
-if ($uri !== '/' && $staticFilePath = $valetDriver->isStaticFile($valetSitePath, $siteName, $uri)) {
+$valetPathInfo = pathinfo($uri);
+
+$isPhpFile = false;
+
+if (isset($valetPathInfo['extension']) && $valetPathInfo['extension'] === 'php') {
+    $isPhpFile = true;
+}
+
+if ($uri !== '/' && ! $isPhpFile && $staticFilePath = $valetDriver->isStaticFile($valetSitePath, $siteName, $uri)) {
     return $valetDriver->serveStaticFile($staticFilePath, $valetSitePath, $siteName, $uri);
 }