diff --git a/index.php b/index.php
index 66627f3e75..93a3785322 100644
--- a/index.php
+++ b/index.php
@@ -66,6 +66,7 @@ if (isset($_REQUEST['ajax_request']) && ! empty($_REQUEST['access_time'])) {
     exit;
 }
 
+// user selected font size
 if (isset($_POST['set_fontsize']) && preg_match('/^[0-9.]+(px|em|pt|\%)$/', $_POST['set_fontsize'])) {
     $GLOBALS['PMA_Config']->setUserValue(
         null,
@@ -76,6 +77,15 @@ if (isset($_POST['set_fontsize']) && preg_match('/^[0-9.]+(px|em|pt|\%)$/', $_PO
     header('Location: index.php' . Url::getCommonRaw());
     exit();
 }
+// if user selected a theme
+if (isset($_POST['set_theme'])) {
+    $tmanager = ThemeManager::getInstance();
+    $tmanager->setActiveTheme($_POST['set_theme']);
+    $tmanager->setThemeCookie();
+    header('Location: index.php' . Url::getCommonRaw());
+    exit();
+}
+
 
 // See FAQ 1.34
 if (! empty($_REQUEST['db'])) {
diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php
index 0dff5e2722..68c8b8cad2 100644
--- a/libraries/classes/ThemeManager.php
+++ b/libraries/classes/ThemeManager.php
@@ -428,11 +428,6 @@ class ThemeManager
     {
         $tmanager = self::getInstance();
 
-        if (isset($_REQUEST['set_theme'])) {
-            // if user selected a theme
-            $tmanager->setActiveTheme($_REQUEST['set_theme']);
-        }
-
         /**
          * the theme object
          *