diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 7b7fe9d677..1a75017dfe 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -201,6 +201,7 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
 		[ NSMenu setMenuBarVisible:!full_screen ];
 
 		this->UpdateVideoModes();
+		InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
 		return true;
 	}
 
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index f122a2921b..a1f8960503 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -761,6 +761,7 @@ bool VideoDriver_SDL_Base::ToggleFullscreen(bool fullscreen)
 		DEBUG(driver, 0, "SDL_SetWindowFullscreen() failed: %s", SDL_GetError());
 	}
 
+	InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
 	return ret == 0;
 }
 
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index f9ec2a86c4..8f7c26b898 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -763,6 +763,7 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
 		_fullscreen ^= true;
 	}
 
+	InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
 	return ret;
 }
 
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index ae1f5aafad..30729ead6d 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -967,7 +967,10 @@ bool VideoDriver_Win32Base::ToggleFullscreen(bool full_screen)
 	std::unique_lock<std::recursive_mutex> lock;
 	if (this->draw_mutex != nullptr) lock = std::unique_lock<std::recursive_mutex>(*this->draw_mutex);
 
-	return this->MakeWindow(full_screen);
+	bool res = this->MakeWindow(full_screen);
+
+	InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
+	return res;
 }
 
 void VideoDriver_Win32Base::AcquireBlitterLock()