diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index d39a3b60b5..c552709f24 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -545,8 +545,13 @@ static void gwps_leave_wps(bool theme_enabled)
         {
 #ifdef HAVE_BACKDROP_IMAGE
             skin_backdrop_show(sb_get_backdrop(i));
+
+            /* The following is supposed to erase any traces of %VB
+               viewports drawn by the WPS. May need further thought... */
+            struct wps_data *sbs = skin_get_gwps(CUSTOM_STATUSBAR, i)->data;
+            if (gwps->data->use_extra_framebuffer && sbs->use_extra_framebuffer)
+                skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
 #endif
-            skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
             viewportmanager_theme_undo(i, skin_has_sbs(gwps));
         }
     }