diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 681912f17c..e2ea0a20f1 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -115,8 +115,11 @@ void SetLocalCompany(CompanyID new_company)
 
 	_current_company = _local_company = new_company;
 
-	/* Delete any construction windows... */
-	if (switching_company) CloseConstructionWindows();
+	if (switching_company) {
+		InvalidateWindowClassesData(WC_COMPANY);
+		/* Delete any construction windows... */
+		CloseConstructionWindows();
+	}
 
 	/* ... and redraw the whole screen. */
 	MarkWholeScreenDirty();