diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 3c713294..28d9529d 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -456,10 +456,6 @@ static void menuactionpress(void)
         case 0:
             music.playef(11);
             graphics.screenbuffer->toggleFullScreen();
-
-            // Recreate menu to update "resize to nearest"
-            game.createmenu(game.currentmenuname, true);
-
             game.savestatsandsettings_menu();
             break;
         case 1:
diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp
index a232634e..654980b0 100644
--- a/desktop_version/src/Screen.cpp
+++ b/desktop_version/src/Screen.cpp
@@ -4,6 +4,7 @@
 #include <stdio.h>
 
 #include "FileSystemUtils.h"
+#include "Game.h"
 #include "GraphicsUtil.h"
 
 // Used to create the window icon
@@ -328,6 +329,12 @@ void Screen::toggleFullScreen(void)
 {
 	isWindowed = !isWindowed;
 	ResizeScreen(-1, -1);
+
+	if (game.currentmenuname == Menu::graphicoptions)
+	{
+		/* Recreate menu to update "resize to nearest" */
+		game.createmenu(game.currentmenuname, true);
+	}
 }
 
 void Screen::toggleStretchMode(void)