diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 1fa1a409..3e16210f 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -84,6 +84,8 @@ function adminer_message_query($query) {
 function adminer_navigation($missing) {
 	global $SELF;
 	if (call_adminer('navigation', true, $missing) && $missing != "auth") {
+		ob_flush();
+		flush();
 		$databases = get_databases();
 		?>
 <form action="" method="post">
diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index f2449a75..a4377651 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -201,14 +201,10 @@ function connect() {
 	return $dbh->error;
 }
 
-function get_databases($flush = true) {
+function get_databases() {
 	// SHOW DATABASES can take a very long time so it is cached
 	$return = &$_SESSION["databases"][$_GET["server"]];
 	if (!isset($return)) {
-		if ($flush) {
-			ob_flush();
-			flush();
-		}
 		$return = get_vals("SHOW DATABASES");
 	}
 	return $return;
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index b866ed31..a5a113d8 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -8,7 +8,7 @@ function adminer_credentials() {
 }
 
 function adminer_database() {
-	$dbs = get_databases(false);
+	$dbs = get_databases();
 	return call_adminer('database', (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test')));
 }