diff --git a/apps/wps.c b/apps/wps.c
index 1db85d806c..4699ed30d8 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -547,6 +547,11 @@ bool display_custom_wps(int x_val, int y_val, bool do_scroll, char *wps_string)
                                          (id3->elapsed + ff_rewind_count) / 60000,
                                          (id3->elapsed + ff_rewind_count) % 60000 / 1000);
                                 break;
+                            case 'r': /* Remaining Time in Song */
+                                snprintf(tmpbuf, sizeof(tmpbuf), "%d:%02d",
+                                         (id3->length - (id3->elapsed + ff_rewind_count)) / 60000,
+                                         (id3->length - (id3->elapsed + ff_rewind_count)) % 60000 / 1000);
+                                break;
                             case 't':  /* Total Time */
                                 snprintf(tmpbuf, sizeof(tmpbuf), "%d:%02d",
                                          id3->length / 60000,
@@ -1019,7 +1024,9 @@ static bool ffwd_rew(int button)
         if (!exit)
             button = button_get(true);
     }
-
+#ifdef CUSTOM_WPS
+    refresh_wps(true);
+#endif
     return usb;
 }
 
diff --git a/docs/CUSTOM_WPS_FORMAT b/docs/CUSTOM_WPS_FORMAT
index 776135ba47..e4721bcce9 100644
--- a/docs/CUSTOM_WPS_FORMAT
+++ b/docs/CUSTOM_WPS_FORMAT
@@ -45,6 +45,7 @@ Playlist/Song Info Tags:
   %pp : Playlist Position
   %pe : Playlist Total Entries
   %pc : Current Time In Song
+  %pr : Remaining Time In Song
   %pt : Total Track Time
 Other Tags:
   %% : Displays a %