diff --git a/system/src/Grav/Framework/Filesystem/Filesystem.php b/system/src/Grav/Framework/Filesystem/Filesystem.php
index d93f4c22a..2f66e54c6 100644
--- a/system/src/Grav/Framework/Filesystem/Filesystem.php
+++ b/system/src/Grav/Framework/Filesystem/Filesystem.php
@@ -239,12 +239,12 @@ class Filesystem implements FilesystemInterface
 
         if (null !== $scheme) {
             $info['scheme'] = $scheme;
-            $dirname = isset($info['dirname']) && $info['dirname'] !== '.' ? $info['dirname'] : null;
+            $dirname = $info['dirname'] ?? '.';
 
-            if (null !== $dirname) {
+            if ('' !== $dirname && '.' !== $dirname) {
                 // In Windows dirname may be using backslashes, fix that.
                 if (DIRECTORY_SEPARATOR !== '/') {
-                    $dirname = str_replace('\\', '/', $dirname);
+                    $dirname = str_replace(DIRECTORY_SEPARATOR, '/', $dirname);
                 }
 
                 $info['dirname'] = $scheme . '://' . $dirname;