diff --git a/source/gx/gui/legal.c b/source/gx/gui/legal.c
index 57a576b..605c07d 100644
--- a/source/gx/gui/legal.c
+++ b/source/gx/gui/legal.c
@@ -128,12 +128,6 @@ void legal ()
     /* switch user progressive mode configuration  */
     config.v_prog ^= 1;
 
-    if (VIDEO_HaveComponentCable())
-    {
-      /* switch video mode only if component cable has been detected */
-      vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
-    }
-
     /* play sound to inform user then enter main menu */
     ASND_Pause(0);
     int voice = ASND_GetFirstUnusedVoice();
diff --git a/source/gx/gx_video.c b/source/gx/gx_video.c
index c0e95d1..dc0cd5e 100644
--- a/source/gx/gx_video.c
+++ b/source/gx/gx_video.c
@@ -1384,6 +1384,13 @@ void gx_video_Stop(void)
 #ifdef HW_RVL
   VIDEO_SetTrapFilter(1);
   VIDEO_SetGamma(VI_GM_1_0);
+#else
+  /* support for progressive mode (480p) if component cable has been detected */
+  if (VIDEO_HaveComponentCable())
+  {
+    /* switch into configured video mode */
+    vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
+  }
 #endif
 
   /* adjust TV width */
@@ -1684,11 +1691,6 @@ void gx_video_Init(void)
       TV60hz_240p.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_NON_INTERLACE);
       TV60hz_240i.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_INTERLACE);
       TV60hz_480i.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_INTERLACE);
-
-#ifndef HW_RVL
-      /* force 480p on GameCube if Component Cable is detected & progressiev mode is selected */
-      if (VIDEO_HaveComponentCable() && config.v_prog) vmode = &TVNtsc480Prog;
-#endif
       break;
   }