diff --git a/ChangeLog b/ChangeLog
index 20cb17055a..bb0cbfc725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - issue #14212 XML Export from single table throws fatal error
 - issue #14239 Line and some other charts ignore result set order of values chosen for the x-axis
 - issue #14260 Fixed configuration for DefaultLang and Lang
+- issue #14264 Linking for 'Distinct values' broken
 
 4.8.0.1 (2018-04-19)
 - issue        [security] Multiple CSRF vulnerabilities, See PMASA-2018-02
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 6c4b7ed38b..0961f8d232 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -5342,10 +5342,14 @@ class Results
                     }
 
                 }
+
+                $tag_params = array('title' => $title);
+                if (strpos($class, 'grid_edit') !== false) {
+                    $tag_params['class'] = 'ajax';
+                }
                 $result .= Util::linkOrButton(
                     'sql.php' . Url::getCommon($_url_params),
-                    $message,
-                    array('class' => 'ajax', 'title' => $title)
+                    $message, $tag_params
                 );
             }