Index: apps/gui/gwps-common.c
===================================================================
--- apps/gui/gwps-common.c	(revision 20696)
+++ apps/gui/gwps-common.c	(working copy)
@@ -2058,38 +2058,5 @@
 
     display->update();
 
-#ifdef HAVE_BACKLIGHT
-    if (global_settings.caption_backlight)
-    {
-        /* turn on backlight n seconds before track ends, and turn it off n
-           seconds into the new track. n == backlight_timeout, or 5s */
-        int n = global_settings.backlight_timeout * 1000;
-
-        if ( n < 1000 )
-            n = 5000; /* use 5s if backlight is always on or off */
-
-        if (((id3->elapsed < 1000) ||
-             ((id3->length - id3->elapsed) < (unsigned)n)) &&
-            (state->paused == false))
-            backlight_on();
-    }
-#endif
-#ifdef HAVE_REMOTE_LCD
-    if (global_settings.remote_caption_backlight)
-    {
-        /* turn on remote backlight n seconds before track ends, and turn it
-           off n seconds into the new track. n == remote_backlight_timeout,
-           or 5s */
-        int n = global_settings.remote_backlight_timeout * 1000;
-
-        if ( n < 1000 )
-            n = 5000; /* use 5s if backlight is always on or off */
-
-        if (((id3->elapsed < 1000) ||
-             ((id3->length - id3->elapsed) < (unsigned)n)) &&
-            (state->paused == false))
-            remote_backlight_on();
-    }
-#endif
     return true;
 }
Index: apps/gui/gwps.c
===================================================================
--- apps/gui/gwps.c	(revision 20696)
+++ apps/gui/gwps.c	(working copy)
@@ -678,6 +678,40 @@
                 break;
         }
 
+#ifdef HAVE_BACKLIGHT
+        if (global_settings.caption_backlight)
+        {
+            /* turn on backlight n seconds before track ends, and turn it off
+               n seconds into the new track. n == backlight_timeout, or 5s */
+            int n = global_settings.backlight_timeout * 1000;
+
+            if ( n < 1000 )
+                n = 5000; /* use 5s if backlight is always on or off */
+
+            if (((wps_state.id3->elapsed < 1000) ||
+                 ((wps_state.id3->length - wps_state.id3->elapsed) < (unsigned)n))
+                && (wps_state.paused == false))
+                backlight_on();
+        }
+#endif
+#ifdef HAVE_REMOTE_LCD
+        if (global_settings.remote_caption_backlight)
+        {
+            /* turn on remote backlight n seconds before track ends, and turn
+               it off n seconds into the new track. 
+               n == remote_backlight_timeout, or 5s */
+            int n = global_settings.remote_backlight_timeout * 1000;
+
+            if ( n < 1000 )
+                n = 5000; /* use 5s if backlight is always on or off */
+
+            if (((wps_state.id3->elapsed < 1000) ||
+                 ((wps_state.id3->length - wps_state.id3->elapsed) < (unsigned)n))
+                && (wps_state.paused == false))
+                remote_backlight_on();
+        }
+#endif
+
         if (wps_state.do_full_update || update)
         {
             FOR_NB_SCREENS(i)