diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_upgrade.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_upgrade.java
index 3c69d716e..7dd7a958a 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_upgrade.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_upgrade.java
@@ -17,14 +17,11 @@ package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; i
 import gplx.dbs.*; import gplx.dbs.cfgs.*;
 public class Srch_db_upgrade {
 	private final    Xow_wiki wiki;
-	private boolean upgrade_prompted;
 	public Srch_db_upgrade(Xow_wiki wiki, Srch_db_mgr search_db_mgr) {
 		this.wiki = wiki;
 	}
 	public void Upgrade() {
 		if (!wiki.App().Mode().Tid_is_gui()) return;	// ignore if html-server or drd-app
-		if (upgrade_prompted) return;
-		upgrade_prompted = true;
 		Xoae_app app = ((Xoae_app)wiki.App());
 		boolean ok = app.Gui_mgr().Kit().Ask_ok_cancel("", "", String_.Concat_lines_nl_skip_last
 		( "XOWA would like to upgrade your search database for " + wiki.Domain_str() + "."
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
index 9d36e789b..f49aae814 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_search_mgr.java
@@ -29,6 +29,7 @@ public class Srch_search_mgr implements Gfo_invk {
 	private final    Srch_search_cmd[]			cur_cmds;
 	private final    Object						mutex = new Object();
 	private int search_count;
+	private boolean upgrade_prompted;
 	public Srch_search_mgr(Srch_search_addon addon, Xow_wiki wiki, Srch_text_parser parser) {
 		this.addon = addon; this.wiki = wiki;
 		crt_parser = new Srch_crt_parser(Srch_crt_scanner_syms.Dflt);	// NOTE: hard-coded to dflt; should change to use qry.Phrase.Syms, but requires more work
@@ -49,7 +50,9 @@ public class Srch_search_mgr implements Gfo_invk {
 		if (qry.Phrase.Orig.length == 0) return;
 
 		// handle obsolete search dbs;
-		if (addon.Db_mgr().Cfg().Version_id__needs_upgrade()) {
+		if (addon.Db_mgr().Cfg().Version_id__needs_upgrade()
+			&& !upgrade_prompted) {
+			upgrade_prompted = true;
 			Srch_db_upgrade upgrade_mgr = new Srch_db_upgrade(wiki, addon.Db_mgr());
 			upgrade_mgr.Upgrade();
 			return;