diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 942dd83de5..21d7862541 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -215,8 +215,8 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
     rb->backlight_on();
     rb->splash(HZ, "Done");
     update_screen();
-    button = rb->button_get(true);
     while (1) {
+        button = rb->button_get(true);
         switch (button) {
 #ifdef HAVE_REMOTE_LCD
             case STATS_STOP_REMOTE:
@@ -230,6 +230,6 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
                 }
                 break;
         }
-        return PLUGIN_OK;
     }
+    return PLUGIN_OK;
 }
diff --git a/docs/CREDITS b/docs/CREDITS
index b9d874b326..131aebaf21 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -394,6 +394,7 @@ Davide Gentile
 James Vasile
 Mohamed Tarek
 Mike Burke
+Michael Chicoine
 
 The libmad team
 The wavpack team