diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index ce8a854c..5ddda826 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -51,7 +51,7 @@ class SetupController extends Controller
             );
         }
 
-        $content = File::get('..'.DIRECTORY_SEPARATOR.'.env');
+        $content = File::get(base_path('.env'));
         $content = str_replace(
             'DB_CONNECTION = '.env('DB_CONNECTION'),
             'DB_CONNECTION = '.$request->input('type'),
@@ -87,12 +87,7 @@ class SetupController extends Controller
             'DB_PREFIX = '.$request->input('prefix'),
             $content
         );
-        $content = str_replace(
-            'FIRST_RUN = true',
-            '',
-            $content
-        );
-        File::put('..'.DIRECTORY_SEPARATOR.'.env', $content);
+        File::put(base_path('.env'), $content);
 
         return redirect('setup/info');
     }
diff --git a/tests/SetupControllerTest.php b/tests/SetupControllerTest.php
index 86f1a153..fa72a930 100644
--- a/tests/SetupControllerTest.php
+++ b/tests/SetupControllerTest.php
@@ -65,8 +65,8 @@ class SetupControllerTest extends TestCase
             'password' => env('DB_PASSWORD'),
             'prefix' => '',
         ];
-        File::shouldReceive('get')->with('..'.DIRECTORY_SEPARATOR.'.env')->andReturn('');
-        File::shouldReceive('put')->with('..'.DIRECTORY_SEPARATOR.'.env', '');
+        File::shouldReceive('get')->with(base_path('.env'))->andReturn('');
+        File::shouldReceive('put')->with(base_path('.env'), '');
         $this->post('/setup/database', $fake)->assertRedirect('/setup/info');
 
         $this->get('/setup/database')->assertRedirect('/setup/info');