diff --git a/tools/retroarch-joyconfig.c b/tools/retroarch-joyconfig.c
index af7aa75327..dad2e3d7a1 100644
--- a/tools/retroarch-joyconfig.c
+++ b/tools/retroarch-joyconfig.c
@@ -124,7 +124,7 @@ static void get_binds(config_file_t *conf, config_file_t *auto_conf, int player,
    bool block_axis = false;
 
    poll_joypad(driver, joypad, &old_poll);
-   fprintf(stderr, "\nJoypads tend to have stale state after opened.\nPress some buttons and move some axes around to make sure joypad state is reset properly.\nWhen done, press Enter ... ");
+   fprintf(stderr, "\nJoypads tend to have stale state after opened.\nPress some buttons and move some axes around to make sure joypad state is completely neutral before proceeding.\nWhen done, press Enter ... ");
    getchar();
    poll_joypad(driver, joypad, &old_poll);
 
@@ -144,6 +144,12 @@ static void get_binds(config_file_t *conf, config_file_t *auto_conf, int player,
       initial_axes[i] = initial;
    }
 
+   for (int i = 0; i < MAX_BUTTONS; i++)
+   {
+      if (old_poll.buttons[i])
+         fprintf(stderr, "Button %d was initially pressed. This indicates broken initial state.\n", i);
+   }
+
    fprintf(stderr, "Configuring binds for player #%d on joypad #%d.\n\n",
          player + 1, joypad);