diff --git a/ChangeLog b/ChangeLog
index adc72084fb..3744b9d639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 - issue #13710 Fixed possible error in server advisor
 - issue #13477 Fixed setting input transformations
 - issue #13552 Fixed IPv4/IPv6 To Binary input transformation
+- issue #13686 Clicking on column name to trigger sort with an active search leads to logout
 
 4.7.4 (2017-08-23)
 - issue #13415 Remove shadow from the logo
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index ebab2293d0..3a2f9108ed 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1849,6 +1849,7 @@ class Util
                 $submit_link    = '#';
             } else {
                 $query_parts[] = 'redirect=' . $url_parts['path'];
+                $query_parts[] = 'token=' . $_SESSION[' PMA_token '];
                 if (empty($GLOBALS['subform_counter'])) {
                     $GLOBALS['subform_counter'] = 0;
                 }