diff --git a/ChangeLog b/ChangeLog
index 84c9065af8..e9bc7e413b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 - issue #13269 Small refactoring in preparation to CSP
 
 4.7.2 (not yet released)
+- issue #13314 Make theme selection keep current server
 
 4.7.1 (2017-05-25)
 - issue #13132 Always execute tracking queries as controluser
diff --git a/libraries/ThemeManager.php b/libraries/ThemeManager.php
index 18de556ead..8c07e9e3bb 100644
--- a/libraries/ThemeManager.php
+++ b/libraries/ThemeManager.php
@@ -367,8 +367,9 @@ class ThemeManager
         $select_box = '';
 
         if ($form) {
-            $select_box .= '<form name="setTheme" method="get"';
+            $select_box .= '<form name="setTheme" method="post"';
             $select_box .= ' action="index.php" class="disableAjax">';
+            $select_box .= URL::getHiddenInputs();
         }
 
         $theme_preview_path= './themes.php';