diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index 1b9051c01..add87d3be 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -171,6 +171,8 @@ class Themes extends Iterator
             exit("Theme '$name' does not exist, unable to display page.");
         }
 
+        $this->config->set('theme', $config->get('themes.' . $name));
+
         if (empty($class)) {
             $class = new Theme($grav, $config, $name);
         }