diff --git a/mysql/edit_dbase.cgi b/mysql/edit_dbase.cgi
index ef07cbfc8..725477a2a 100755
--- a/mysql/edit_dbase.cgi
+++ b/mysql/edit_dbase.cgi
@@ -113,7 +113,12 @@ elsif (@titles || @indexes) {
 		}
 	}
 else {
-	print "<b>$text{'dbase_none'}</b> <p>\n";
+	if ($in{'search'}) {
+		print "<b>$text{'dbase_none2'}</b> <p>\n";
+		}
+	else {
+		print "<b>$text{'dbase_none'}</b> <p>\n";
+		}
 	}
 &show_buttons();
 
diff --git a/mysql/lang/en b/mysql/lang/en
index 416c2deb6..3ec9a56aa 100644
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -54,6 +54,7 @@ dbase_drop=Drop Database
 dbase_exec=Execute SQL
 dbase_backup=Backup Database
 dbase_none=This database has no tables.
+dbase_none2=No tables matched your search.
 dbase_fields=Fields:
 dbase_return=table list
 dbase_ecannot=You are not allowed to edit this database