diff --git a/ChangeLog b/ChangeLog
index c7295441b8..276e9e5a74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog
 - issue #12494 Can't add a new User
 - issue #12523 Add 'token' Parameter in all POST requests (Fix 'Token mismatch' errors)
 - issue #12302 Improved usage of number_format
+- issue #12656 Server selection not working
 
 4.6.5 (not yet released)
 - issue        Remove potentionally license problematic sRGB profile
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index d936349e15..ec69b91d91 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -38,6 +38,8 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
         if (! $omit_fieldset) {
             $retval .= '<fieldset>';
         }
+
+        $retval .= '<input type="hidden" name="token" value="' . $_SESSION[" PMA_token "] . '" >';
         $retval .= '<label for="select_server">'
             . __('Current server:') . '</label> ';