diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 8ddbe85d..851ea03e 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -2279,21 +2279,6 @@ void Graphics::drawmap()
 
 void Graphics::drawfinalmap()
 {
-    //Update colour cycling for final level
-    if (map.final_colormode) {
-        map.final_aniframedelay--;
-        if(map.final_aniframedelay==0)
-        {
-            foregrounddrawn=false;
-        }
-        if (map.final_aniframedelay <= 0) {
-            map.final_aniframedelay = 2;
-            map.final_aniframe++;
-            if (map.final_aniframe >= 4)
-                map.final_aniframe = 0;
-        }
-    }
-
     if (!foregrounddrawn) {
         FillRect(foregroundBuffer, 0x00000000);
         if(map.tileset==0){
diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 8bed0f9b..b4240af0 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -1306,6 +1306,23 @@ void gamelogic()
             }
         }
     }
+
+    //Update colour cycling for final level
+    if (map.finalmode && map.final_colormode)
+    {
+        map.final_aniframedelay--;
+        if(map.final_aniframedelay==0)
+        {
+            graphics.foregrounddrawn=false;
+        }
+        if (map.final_aniframedelay <= 0) {
+            map.final_aniframedelay = 2;
+            map.final_aniframe++;
+            if (map.final_aniframe >= 4)
+                map.final_aniframe = 0;
+        }
+    }
+
     int j;
     if (game.roomchange)
     {