diff --git a/industry_gui.c b/industry_gui.c
index 10b2c5d3d3..24decb00c0 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -267,6 +267,7 @@ static const WindowDesc * const _industry_window_desc[2][4] = {
 
 void ShowBuildIndustryWindow(void)
 {
+	if (_current_player == OWNER_SPECTATOR) return;
 	AllocateWindowDescFront(_industry_window_desc[_patches.build_rawmaterial_ind][_opt_ptr->landscape],0);
 }
 
diff --git a/main_gui.c b/main_gui.c
index 2c8c1a2aeb..0664927119 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -791,7 +791,8 @@ static void ToolbarLeagueClick(Window *w)
 
 static void ToolbarIndustryClick(Window *w)
 {
-	PopupMainToolbMenu(w, 280, 12, STR_INDUSTRY_DIR, 2, 0);
+	int dis = _current_player == OWNER_SPECTATOR ? 2 : 0;
+	PopupMainToolbMenu(w, 280, 12, STR_INDUSTRY_DIR, 2, dis);
 }
 
 static void ToolbarTrainClick(Window *w)