diff --git a/ChangeLog b/ChangeLog
index 51672e5999..3578aaab42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 
 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
+- bug #3303869 [interface] Unnecessary scrolling on Databases page
 
 3.4.1.0 (not yet released)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/server_databases.php b/server_databases.php
index 8c8155364a..aba73e731f 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -100,6 +100,16 @@ echo '<h2>' . "\n"
    . ($dbstats ? __('Databases statistics') : __('Databases')) . "\n"
    .'</h2>' . "\n";
 
+/**
+ * Create new database.
+ */
+if ($cfg['ShowCreateDb']) {
+    echo '<ul><li id="li_create_database">' . "\n";
+    require './libraries/display_create_database.lib.php';
+    echo '    </li>' . "\n";
+    echo '</ul>' . "\n";
+}
+
 /**
  * Gets the databases list
  */
@@ -268,16 +278,6 @@ if ($databases_count > 0) {
 }
 unset($databases_count);
 
-/**
- * Create new database.
- */
-if ($cfg['ShowCreateDb']) {
-    echo '<ul><li id="li_create_database">' . "\n";
-    require './libraries/display_create_database.lib.php';
-    echo '    </li>' . "\n";
-    echo '</ul>' . "\n";
-}
-
 /**
  * Sends the footer
  */