diff --git a/app/Http/Controllers/Admin/AdminSettingsController.php b/app/Http/Controllers/Admin/AdminSettingsController.php
index ab5b838f..6c5f3cd5 100644
--- a/app/Http/Controllers/Admin/AdminSettingsController.php
+++ b/app/Http/Controllers/Admin/AdminSettingsController.php
@@ -11,41 +11,79 @@ use App\Util\Lexer\PrettyNumber;
 
 trait AdminSettingsController
 {
-    public function settings(Request $request)
-    {
-      return view('admin.settings.home');
-    }
+	public function settings(Request $request)
+	{
+		return view('admin.settings.home');
+	}
 
-    public function settingsBackups(Request $request)
-    {
-      $path = storage_path('app/'.config('app.name'));
-      $files = is_dir($path) ? new \DirectoryIterator($path) : [];
-      return view('admin.settings.backups', compact('files'));
-    }
+	public function settingsBackups(Request $request)
+	{
+		$path = storage_path('app/'.config('app.name'));
+		$files = is_dir($path) ? new \DirectoryIterator($path) : [];
+		return view('admin.settings.backups', compact('files'));
+	}
 
-    public function settingsConfig(Request $request)
-    {
-      $editor = [];
-      $config = file_get_contents(base_path('.env'));
-      return view('admin.settings.config', compact('editor', 'config'));
-    }
+	public function settingsConfig(Request $request)
+	{
+		$editor = config('pixelfed.admin.env_editor');
+		$config = !$editor ? false : file_get_contents(base_path('.env'));
+		$backup = !$editor ? false : file_get_contents(base_path('.env.backup'));
+		return view('admin.settings.config', compact('editor', 'config', 'backup'));
+	}
 
-    public function settingsMaintenance(Request $request)
-    {
-      return view('admin.settings.maintenance');
-    }
+	public function settingsConfigStore(Request $request)
+	{
+		if(config('pixelfed.admin.env_editor') !== true) {
+			abort(400);
+		}
+		$res = $request->input('res');
 
-    public function settingsStorage(Request $request)
-    {
-      $storage = [];
-      return view('admin.settings.storage', compact('storage'));
-    }
+		$old = file_get_contents(app()->environmentFilePath());
+		if(empty($old) || $old != $res) {
+			$oldFile = fopen(app()->environmentFilePath().'.backup', 'w');
+			fwrite($oldFile, $old);
+			fclose($oldFile);
+		}
+
+		$file = fopen(app()->environmentFilePath(), 'w');
+		fwrite($file, $res);
+		fclose($file);
+		Artisan::call('config:cache');
+		return ['msg' => 200];
+	}
+
+	public function settingsConfigRestore(Request $request)
+	{
+		if(config('pixelfed.admin.env_editor') !== true) {
+			abort(400);
+		}
+		$res = file_get_contents(app()->environmentFilePath().'.backup');
+		if(empty($res)) {
+			abort(400, 'No backup exists.');
+		}
+		$file = fopen(app()->environmentFilePath(), 'w');
+		fwrite($file, $res);
+		fclose($file);
+		Artisan::call('config:cache');
+		return ['msg' => 200];
+	}
+
+	public function settingsMaintenance(Request $request)
+	{
+		return view('admin.settings.maintenance');
+	}
+
+	public function settingsStorage(Request $request)
+	{
+		$storage = [];
+		return view('admin.settings.storage', compact('storage'));
+	}
+
+	public function settingsFeatures(Request $request)
+	{
+		return view('admin.settings.features');
+	}
 
-    public function settingsFeatures(Request $request)
-    {
-      return view('admin.settings.features');
-    }
-    
 	public function settingsHomeStore(Request $request)
 	{
 		$this->validate($request, [
@@ -57,7 +95,7 @@ trait AdminSettingsController
 
 	public function settingsPages(Request $request)
 	{
-    $pages = Page::orderByDesc('updated_at')->paginate(10);
+		$pages = Page::orderByDesc('updated_at')->paginate(10);
 		return view('admin.pages.home', compact('pages'));
 	}
 
@@ -66,35 +104,35 @@ trait AdminSettingsController
 		return view('admin.pages.edit');
 	}
 
-  public function settingsSystem(Request $request)
-  {
-    $sys = [
-      'pixelfed' => config('pixelfed.version'),
-      'php' => phpversion(),
-      'laravel' => app()->version(),
-    ];
-    switch (config('database.default')) {
-      case 'pgsql':
-        $sys['database'] = [
-          'name' => 'Postgres',
-          'version' => explode(' ', DB::select(DB::raw('select version();'))[0]->version)[1]
-        ];
-        break;
+	public function settingsSystem(Request $request)
+	{
+		$sys = [
+			'pixelfed' => config('pixelfed.version'),
+			'php' => phpversion(),
+			'laravel' => app()->version(),
+		];
+		switch (config('database.default')) {
+			case 'pgsql':
+			$sys['database'] = [
+				'name' => 'Postgres',
+				'version' => explode(' ', DB::select(DB::raw('select version();'))[0]->version)[1]
+			];
+			break;
 
-      case 'mysql':
-        $sys['database'] = [
-          'name' => 'MySQL',
-          'version' => DB::select( DB::raw("select version()") )[0]->{'version()'}
-        ];
-        break;
-      
-      default:
-        $sys['database'] = [
-          'name' => 'Unknown',
-          'version' => '?'
-        ];
-        break;
-    }
-    return view('admin.settings.system', compact('sys'));
-  }
+			case 'mysql':
+			$sys['database'] = [
+				'name' => 'MySQL',
+				'version' => DB::select( DB::raw("select version()") )[0]->{'version()'}
+			];
+			break;
+
+			default:
+			$sys['database'] = [
+				'name' => 'Unknown',
+				'version' => '?'
+			];
+			break;
+		}
+		return view('admin.settings.system', compact('sys'));
+	}
 }
\ No newline at end of file
diff --git a/config/pixelfed.php b/config/pixelfed.php
index 7356fb2e..301c5315 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -274,4 +274,8 @@ return [
     'sanitizer' => [
         'restrict_html_types' => env('RESTRICT_HTML_TYPES', true)
     ],
+
+    'admin' => [
+        'env_editor' => env('ADMIN_ENV_EDITOR', false)
+    ],
 ];
diff --git a/resources/views/admin/settings/config.blade.php b/resources/views/admin/settings/config.blade.php
index 8a9d017d..024ebc4c 100644
--- a/resources/views/admin/settings/config.blade.php
+++ b/resources/views/admin/settings/config.blade.php
@@ -5,10 +5,80 @@
 @section('section')
   <div class="title">
     <h3 class="font-weight-bold">Configuration Settings</h3>
+    @if($editor == false)
+    <hr>
+    <div class="card bg-light shadow-none rounded-0">
+      <div class="card-body text-center py-5">
+        <p class="lead text-muted font-weight-bold">Configuration Editor is disabled</p>
+        <p class="mb-0">To enable it, add <code>ADMIN_ENV_EDITOR=true</code> to <code>.env</code><br>then run <code>php artisan config:cache</code></p>
+      </div>
+    </div>
+    @else
     <p class="lead">Edit configuration settings</p>
+    <p class="alert alert-warning">
+      <strong>Warning:</strong> Editing the .env file may cause issues if you change the wrong setting or set the wrong value.
+    </p>
   </div>
   <hr>
-  <p class="alert alert-warning">
-    <strong>Feature Unavailable:</strong> This feature will be released in a future version.
-  </p>
-@endsection
\ No newline at end of file
+  <div>
+    <div id="editor">{{$config}}</div>
+    <hr>
+    <div class="d-flex justify-content-between px-3">
+      <button class="btn btn-outline-secondary font-weight-bold py-1 btn-restore">Restore backup .env</button>
+      <button class="btn btn-primary font-weight-bold py-1 btn-save">Save</button>
+    </div>
+  </div>
+  @endif
+@endsection
+@if($editor == true)
+@push('scripts')
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.4/ace.js"></script>
+<script>
+    let editor = ace.edit("editor");
+    editor.session.setUseWrapMode(true);
+    editor.setTheme("ace/theme/monokai");
+    editor.session.setMode("ace/mode/javascript");
+
+    $('.btn-restore').on('click', function(e) {
+      e.preventDefault();
+      let confirm = window.confirm('Are you sure you want to restore your backup .env?');
+      if(!confirm) {
+        swal('Cancelled', 'You have cancelled the .env backup restore.', 'warning');
+        return;
+      }
+      axios.post('/i/admin/settings/config/restore', {
+      }).then(res => {
+        window.location.href = window.location.href;
+      });
+    })
+
+    $('.btn-save').on('click', function(e) {
+      e.preventDefault();
+      let confirm = window.confirm('Are you sure you want to overwrite your current .env?');
+      if(!confirm) {
+        swal('Cancelled', 'You have cancelled the .env update.', 'warning');
+        return;
+      }
+      axios.post('/i/admin/settings/config', {
+        res: editor.getValue()
+      }).then(res => {
+        window.location.href = window.location.href;
+      });
+    })
+</script>
+@endpush
+
+@push('styles')
+<style type="text/css" media="screen">
+    #editor { 
+        display: block;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        min-height: 400px;
+    }
+</style>
+@endpush
+@endif
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 7a861e46..ee4da973 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -23,6 +23,8 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio
     Route::get('settings', 'AdminController@settings')->name('admin.settings');
     Route::post('settings', 'AdminController@settingsHomeStore');
     Route::get('settings/config', 'AdminController@settingsConfig')->name('admin.settings.config');
+    Route::post('settings/config', 'AdminController@settingsConfigStore');
+    Route::post('settings/config/restore', 'AdminController@settingsConfigRestore');
     Route::get('settings/features', 'AdminController@settingsFeatures')->name('admin.settings.features');
     Route::get('settings/pages', 'AdminController@settingsPages')->name('admin.settings.pages');
     Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');