diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index f92d511c21..b98c88c300 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -334,4 +334,8 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
 {
 	AI::ai_scanner->RescanAIDir();
 	ResetConfig();
+
+	InvalidateWindowData(WC_AI_LIST, 0, 1);
+	SetWindowClassesDirty(WC_AI_DEBUG);
+	SetWindowDirty(WC_AI_SETTINGS, 0);
 }
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index b5f8d2e47e..d632d02805 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -1253,8 +1253,6 @@ DEF_CONSOLE_CMD(ConRescanAI)
 
 	TarScanner::DoScan();
 	AI::Rescan();
-	InvalidateWindowData(WC_AI_LIST, 0, 1);
-	SetWindowDirty(WC_AI_SETTINGS, 0);
 
 	return true;
 }
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 3e901116d1..daebb83a28 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -94,8 +94,6 @@ public:
 				case CONTENT_TYPE_AI:
 				case CONTENT_TYPE_AI_LIBRARY:
 					AI::Rescan();
-					SetWindowClassesDirty(WC_AI_DEBUG);
-					InvalidateWindowData(WC_AI_LIST, 0, 1);
 					break;
 
 				case CONTENT_TYPE_BASE_GRAPHICS: