diff --git a/mysql/index.cgi b/mysql/index.cgi
index 9d1ff9973..2797c6b67 100755
--- a/mysql/index.cgi
+++ b/mysql/index.cgi
@@ -139,7 +139,10 @@ else {
 		if ($can_create);
 	if (!@icons) {
 		# No databases .. tell user
-		if (@alldbs) {
+		if ($in{'search'}) {
+			print "<b>$text{'index_nodbs3'}</b> <p>\n";
+			}
+		elsif (@alldbs) {
 			print "<b>$text{'index_nodbs'}</b> <p>\n";
 			}
 		else {
diff --git a/mysql/lang/en b/mysql/lang/en
index 49a016cff..9026b82de 100644
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -27,6 +27,7 @@ index_mysqlver=The command <tt>$1</tt> returned :
 index_eenvpass=The MySQL client program $1 does not accept passwords passed using the <tt>MYSQL_PWD</tt> environment variable. To ensure that Webmin is able to fully communicate with MySQL, this option should be turned off on the <a href='$2'>module configuration</a> page.
 index_nodbs=You do not have access to any MySQL databases.
 index_nodbs2=No MySQL databases were found on your system.
+index_nodbs3=No MySQL databases matched your search.
 index_backup=Backup Databases
 index_backupmsg=Click this button to setup the backup of all MySQL databases, either immediately or on a configured schedule.
 index_drops=Drop Selected Databases
diff --git a/postgresql/index.cgi b/postgresql/index.cgi
index e28de96a1..eeb6a8096 100755
--- a/postgresql/index.cgi
+++ b/postgresql/index.cgi
@@ -168,7 +168,12 @@ else {
 	push(@rowlinks, "<a href=newdb_form.cgi>$text{'index_add'}</a>")
 		if ($can_create);
 	if (!@icons) {
-		print "<b>$text{'index_nodbs'}</b> <p>\n";
+                if ($in{'search'}) {
+                        print "<b>$text{'index_nodbs3'}</b> <p>\n";
+                        }
+		else {
+			print "<b>$text{'index_nodbs'}</b> <p>\n";
+			}
 		}
 	elsif (@icons > $max_dbs && !$in{'search'}) {
 		# Too many databases to show .. display search and jump forms
diff --git a/postgresql/lang/en b/postgresql/lang/en
index 5345a7195..6fea51419 100644
--- a/postgresql/lang/en
+++ b/postgresql/lang/en
@@ -27,6 +27,7 @@ index_setupok=Initialize Database
 index_nomod=Warning: The Perl module $1 is not installed on your system, so Webmin will not be able to reliably access your PostgreSQL database. <a href='$2'>Click here</a> to install it now.
 index_nomods=Warning: The Perl modules $1 and $2 are not installed on your system, so Webmin will not be able to reliably access your PostgreSQL database. <a href='$3'>Click here</a> to install them now.
 index_nodbs=You do not have access to any databases.
+index_nodbs3=No PostgreSQL databases matched your search.
 index_backup=Backup Databases
 index_backupmsg=Click this button to setup the backup of all PostgreSQL databases, either immediately or on a configured schedule.
 index_sch=(With schemas)