diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index f0ebe3b4..7d5ff21f 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -216,6 +216,7 @@ function get_databases() {
 	// SHOW DATABASES can take very long so it is cached
 	$return = &$_SESSION["databases"][$_GET["server"]];
 	if (!isset($return)) {
+		ob_flush();
 		flush();
 		$return = get_vals("SHOW DATABASES");
 	}
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index f9d666c8..6f2847cb 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -31,6 +31,7 @@ if (!$error && $_POST) {
 				} else {
 					$empty = false;
 					echo "<pre class='jush-sql'>" . shorten_utf8(trim(substr($query, 0, $match[0][1]))) . "</pre>\n";
+					ob_flush();
 					flush(); // can take a long time - show the running query
 					$start = explode(" ", microtime()); // microtime(true) is available since PHP 5
 					//! don't allow changing of character_set_results, convert encoding of displayed query