diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 5b10ce9e3a..c49f27c0bd 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -150,7 +150,15 @@ void wps_do_action(enum wps_do_action_type action, bool updatewps)
     #endif
         }
     }
-    if (updatewps)
+
+    /* Bugfix only do a skin refresh if in one of the below screens */
+    enum current_activity act = get_current_activity();
+
+    bool refresh = (act == ACTIVITY_FM ||
+                    act == ACTIVITY_WPS ||
+                    act == ACTIVITY_RECORDING);
+
+    if (updatewps && refresh)
         update_non_static();
 }
 
diff --git a/apps/misc.c b/apps/misc.c
index 9e6ef1736d..8ce8ccbfa5 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -566,12 +566,7 @@ static void hp_unplug_change(bool inserted)
                     headphone_caused_pause &&
                     global_settings.unplug_mode > 1 )
             {
-                enum current_activity act = get_current_activity();
-                /* only do a skin refresh if in one of the below screens */
-                bool refresh = (act == ACTIVITY_FM ||
-                                act == ACTIVITY_WPS ||
-                                act == ACTIVITY_RECORDING);
-                unpause_action(refresh);
+                unpause_action(true);
             }
             headphone_caused_pause = false;
         } else {