diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bea262044..10d38ffe2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,8 @@
     * Fixed moving `Flex Page` to itself causing the page to be lost [#3227](https://github.com/getgrav/grav/issues/3227)
     * Fixed `PageStorage` from detecting files as pages
     * Fixed `UserIndex` not implementing `UserCollectionInterface`
-    * Fixed system templates not getting scanned [#3296](https://github.com/getgrav/grav/issues/3296)
     * Fixed missing `onAdminAfterDelete` event call in `Flex Pages`
->>>>>>> a8e6aedd043107a3eb2dc47bc7e2509ffb6b6db5
+    * Fixed system templates not getting scanned [#3296](https://github.com/getgrav/grav/issues/3296)
 
 # v1.7.9
 ## 03/19/2021
diff --git a/system/src/Grav/Common/Config/Setup.php b/system/src/Grav/Common/Config/Setup.php
index e01f50eb53..5693a921fe 100644
--- a/system/src/Grav/Common/Config/Setup.php
+++ b/system/src/Grav/Common/Config/Setup.php
@@ -164,7 +164,8 @@ class Setup extends Data
     public function __construct($container)
     {
         // Configure main streams.
-        $this->streams['system']['prefixes'][''] = [GRAV_SYSTEM_PATH];
+        $abs = str_starts_with(GRAV_SYSTEM_PATH, '/');
+        $this->streams['system']['prefixes'][''] = $abs ? ['system', GRAV_SYSTEM_PATH] : ['system'];
         $this->streams['user']['prefixes'][''] = [GRAV_USER_PATH];
         $this->streams['cache']['prefixes'][''] = [GRAV_CACHE_PATH];
         $this->streams['log']['prefixes'][''] = [GRAV_LOG_PATH];