diff --git a/src/Commands/MakeComponent.php b/src/Commands/MakeComponent.php
index 5f7bca07..7e6cafdd 100644
--- a/src/Commands/MakeComponent.php
+++ b/src/Commands/MakeComponent.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Str;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\Form;
+use Statamic\Facades\Path;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\error;
@@ -57,6 +58,6 @@ public function handle(): void
 
     protected function getRelativePath($path): string
     {
-        return str_replace(base_path().'/', '', $path);
+        return Path::makeRelative($path);
     }
 }
diff --git a/src/Commands/MakeTheme.php b/src/Commands/MakeTheme.php
index 9e5725b7..a778efef 100644
--- a/src/Commands/MakeTheme.php
+++ b/src/Commands/MakeTheme.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use Statamic\Console\RunsInPlease;
+use Statamic\Facades\Path;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\info;
@@ -33,6 +34,6 @@ public function handle(): void
 
     protected function getRelativePath($path): string
     {
-        return str_replace(base_path().'/', '', $path);
+        return Path::makeRelative($path);
     }
 }
diff --git a/src/Commands/MakeView.php b/src/Commands/MakeView.php
index a1296917..e607dcc2 100644
--- a/src/Commands/MakeView.php
+++ b/src/Commands/MakeView.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use Statamic\Console\RunsInPlease;
+use Statamic\Facades\Path;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\info;
@@ -36,6 +37,6 @@ public function handle(): void
 
     protected function getRelativePath($path): string
     {
-        return str_replace(base_path().'/', '', $path);
+        return Path::makeRelative($path);
     }
 }
diff --git a/src/ViewManager.php b/src/ViewManager.php
index 7a6b6359..85a24e88 100644
--- a/src/ViewManager.php
+++ b/src/ViewManager.php
@@ -19,7 +19,10 @@ public function absoluteViewPath(string $path = ''): string
 
     public function viewPath(string $view = ''): string
     {
-        return Str::after($this->absoluteViewPath($view), resource_path('views/'));
+        return Str::after(
+            $this->absoluteViewPath($view),
+            Path::tidy(resource_path('views/'))
+        );
     }
 
     public function themeViewPath(string $theme, string $view): string