diff --git a/connect.inc.php b/connect.inc.php
index eac668ee..a85c2ef9 100644
--- a/connect.inc.php
+++ b/connect.inc.php
@@ -1,5 +1,6 @@
 <?php
 if (!(strlen($_GET["db"]) ? $mysql->select_db($_GET["db"]) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]))) {
+	unset($_SESSION["databases"]);
 	page_header(lang('Select database'));
 	if (strlen($_GET["db"])) {
 		echo "<p class='error'>" . lang('Invalid database.') . "</p>\n";
diff --git a/database.inc.php b/database.inc.php
index 95edc6e0..524b5cb2 100644
--- a/database.inc.php
+++ b/database.inc.php
@@ -2,7 +2,6 @@
 if ($_POST && !$error) {
 	if ($_POST["drop"]) {
 		if ($mysql->query("DROP DATABASE " . idf_escape($_GET["db"]))) {
-			unset($_SESSION["databases"]);
 			redirect(substr(preg_replace('~db=[^&]*&~', '', $SELF), 0, -1), lang('Database has been dropped.'));
 		}
 	} elseif ($_GET["db"] !== $_POST["name"]) {