diff --git a/site/plugins/admin/classes/SettingsManager.php b/site/plugins/admin/classes/SettingsManager.php
index 7ea6a3a1..fcabbcbc 100644
--- a/site/plugins/admin/classes/SettingsManager.php
+++ b/site/plugins/admin/classes/SettingsManager.php
@@ -78,6 +78,7 @@ class SettingsManager
                 ->assign('settings', Registry::get('settings'))
                 ->assign('locales', $locales)
                 ->assign('entries', $entries)
+                ->assign('themes', Filesystem::getDirList(PATH['themes']))
                 ->display();
     }
 }
diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php
index eabf4029..f6ef9e20 100644
--- a/site/plugins/admin/views/templates/system/settings/list.php
+++ b/site/plugins/admin/views/templates/system/settings/list.php
@@ -90,7 +90,7 @@ Themes::view('admin/views/partials/content-start')->display();
     <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('theme', __('admin_system_settings_system_theme'), ['for' => 'systemSettingsSystemTheme']) ?>
-            <?= Form::input('theme', $settings['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
+            <?= Form::select('theme', $themes, $settings['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
         </div>
         <div class="form-group">
             <?= Form::label('locale', __('admin_system_settings_system_locale'), ['for' => 'systemSettingsSystemLocale']) ?>