diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index c3f6bb76..9e4fe570 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -386,7 +386,7 @@ if (!defined("DRIVER")) {
 		$return = get_session("dbs");
 		if ($return === null) {
 			$query = (min_version(5)
-				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA"
+				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME"
 				: "SHOW DATABASES"
 			); // SHOW DATABASES can be disabled by skip_show_database
 			$return = ($flush ? slow_query($query) : get_vals($query));
diff --git a/changes.txt b/changes.txt
index 77f862d8..cb6c0215 100644
--- a/changes.txt
+++ b/changes.txt
@@ -8,6 +8,7 @@ Fix displaying info about non-alphabetical objects (bug #599)
 Use secure cookies on HTTP if session.cookie_secure is set
 PDO: Support binary fields download
 MySQL: Use CONVERT() only when searching for non-ASCII (bug #603)
+MySQL: Order database names in MySQL 8 (bug #613)
 PostgreSQL: Add SQL operator to search
 PostgreSQL: Fix editing data in views (bug #605, regression from 4.6.0)
 PostgreSQL: Do not cast date/time/number/uuid searches to text (bug #608)