diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index debce630..0dc638d8 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1291,7 +1291,7 @@ function is_url($string) {
 * @return bool
 */
 function is_shortable($field) {
-	return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
+	return preg_match('~char|text|json|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
 }
 
 /** Get query to compute number of found rows
diff --git a/changes.txt b/changes.txt
index 85f25860..0b104a64 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.6.2-dev:
+Shorten JSON values in select (bug #594)
+
 Adminer 4.6.1 (released 2018-02-09):
 Sticky position of table actions
 Speed up rendering of long tables (regression from 4.4.0)