diff --git a/system/config.php b/system/config.php
index af8360c3..f4c3f291 100644
--- a/system/config.php
+++ b/system/config.php
@@ -100,7 +100,9 @@ private static function parse($key)
 	 */
 	public static function load($file)
 	{
-		if ( ! array_key_exists($file, static::$items) and file_exists($path = APP_PATH.'config/'.$file.EXT))
+		$directory = (isset($_ENV['LARAVEL_ENV'])) ? $_ENV['LARAVEL_ENV'].'/' : '';
+
+		if ( ! array_key_exists($file, static::$items) and file_exists($path = APP_PATH.'config/'.$directory.$file.EXT))
 		{
 			static::$items[$file] = require $path;
 		}