diff --git a/src/blupi.h b/src/blupi.h
index 1be8b96..fe8c20b 100644
--- a/src/blupi.h
+++ b/src/blupi.h
@@ -6,6 +6,7 @@
 
 extern SDL_Window   *g_window;
 extern SDL_Renderer *g_renderer;
+extern bool          g_bFullScreen;
 
 struct POINT
 {
diff --git a/src/event.cxx b/src/event.cxx
index d99b1fd..223df3a 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -1505,7 +1505,7 @@ CEvent::CEvent()
 {
     Sint32      i;
 
-    m_bFullScreen   = true;
+    m_bFullScreen   = g_bFullScreen;
     m_WindowScale   = 1;
     m_exercice      = 0;
     m_mission       = 0;
@@ -1611,6 +1611,9 @@ POINT CEvent::GetMousePos()
 
 void CEvent::SetFullScreen (bool bFullScreen)
 {
+    if (bFullScreen == m_bFullScreen)
+        return;
+
     int x, y;
     SDL_GetMouseState (&x, &y);
     x /= m_WindowScale;
diff --git a/src/misc.cxx b/src/misc.cxx
index cb149c1..eb2329a 100644
--- a/src/misc.cxx
+++ b/src/misc.cxx
@@ -17,11 +17,6 @@
 #include "blupi.h"
 #include "def.h"
 
-// Variables globales
-
-extern bool     g_bFullScreen;  // false si mode de test
-
-
 // Affiche un message de debug.
 
 void OutputDebug (const char *pMessage)