diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp
index 7fa298e9..6c7d42a3 100644
--- a/desktop_version/src/Editor.cpp
+++ b/desktop_version/src/Editor.cpp
@@ -3511,6 +3511,7 @@ void editorinput(void)
                 if (game.currentmenuname == Menu::ed_settings)
                 {
                     ed.state = EditorState_DRAW;
+                    gameScreen.recacheTextures();
                 }
                 else
                 {
diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp
index 508bc3d4..eacd0365 100644
--- a/desktop_version/src/Screen.cpp
+++ b/desktop_version/src/Screen.cpp
@@ -170,9 +170,9 @@ void Screen::ResizeScreen(int x, int y)
     else
     {
         int result = SDL_SetWindowFullscreen(m_window, 0);
-        recacheTextures();
         if (result != 0)
         {
+            recacheTextures();
             vlog_error("Error: could not set the game to windowed mode: %s", SDL_GetError());
             return;
         }
@@ -185,6 +185,7 @@ void Screen::ResizeScreen(int x, int y)
                 SDL_WINDOWPOS_CENTERED_DISPLAY(windowDisplay)
             );
         }
+        recacheTextures();
     }
 }