diff --git a/Templates/Empty/game/core/main.cs b/Templates/Empty/game/core/main.cs
index 0baeb9364..f666c948c 100644
--- a/Templates/Empty/game/core/main.cs
+++ b/Templates/Empty/game/core/main.cs
@@ -141,11 +141,11 @@ function parseArgs()
       switch$ (%arg)
       {
          case "-fullscreen":
-            setFullScreen(true);
+            $cliFullscreen = true;
             $argUsed[%i]++;
 
          case "-windowed":
-            setFullScreen(false);
+            $cliFullscreen = false;
             $argUsed[%i]++;
 
          case "-openGL":
diff --git a/Templates/Empty/game/core/scripts/client/canvas.cs b/Templates/Empty/game/core/scripts/client/canvas.cs
index 69dd6da71..b3a906f46 100644
--- a/Templates/Empty/game/core/scripts/client/canvas.cs
+++ b/Templates/Empty/game/core/scripts/client/canvas.cs
@@ -32,6 +32,9 @@ function configureCanvas()
    if ($pref::Video::mode $= "")
       $pref::Video::mode = "800 600 false 32 60 0";
 
+   if($cliFullscreen !$="")
+      $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen);
+
    %resX = getWord($pref::Video::mode, $WORD::RES_X);
    %resY = getWord($pref::Video::mode, $WORD::RES_Y);
    %fs = getWord($pref::Video::mode,   $WORD::FULLSCREEN);
diff --git a/Templates/Full/game/core/main.cs b/Templates/Full/game/core/main.cs
index 0baeb9364..f666c948c 100644
--- a/Templates/Full/game/core/main.cs
+++ b/Templates/Full/game/core/main.cs
@@ -141,11 +141,11 @@ function parseArgs()
       switch$ (%arg)
       {
          case "-fullscreen":
-            setFullScreen(true);
+            $cliFullscreen = true;
             $argUsed[%i]++;
 
          case "-windowed":
-            setFullScreen(false);
+            $cliFullscreen = false;
             $argUsed[%i]++;
 
          case "-openGL":
diff --git a/Templates/Full/game/core/scripts/client/canvas.cs b/Templates/Full/game/core/scripts/client/canvas.cs
index 69dd6da71..b3a906f46 100644
--- a/Templates/Full/game/core/scripts/client/canvas.cs
+++ b/Templates/Full/game/core/scripts/client/canvas.cs
@@ -32,6 +32,9 @@ function configureCanvas()
    if ($pref::Video::mode $= "")
       $pref::Video::mode = "800 600 false 32 60 0";
 
+   if($cliFullscreen !$="")
+      $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen);
+
    %resX = getWord($pref::Video::mode, $WORD::RES_X);
    %resY = getWord($pref::Video::mode, $WORD::RES_Y);
    %fs = getWord($pref::Video::mode,   $WORD::FULLSCREEN);