diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index ca7b92715..440c98bdf 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -145,7 +145,7 @@ class Theme
     {
         $editTheme = Config::get('cms.editTheme');
         if (!$editTheme)
-            $editTheme = Config::get('cms.activeTheme');
+            $editTheme = static::getActiveTheme()->getDirName();
 
         $apiResult = Event::fire('cms.editTheme', [], true);
         if ($apiResult !== null)