diff --git a/tests/rigctl.c b/tests/rigctl.c
index 8bc99a6e7..3dd46854e 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -86,7 +86,7 @@ static void usage(void);
  * NB: do NOT use -W since it's reserved by POSIX.
  * TODO: add an option to read from a file
  */
-#define SHORT_OPTIONS "+m:r:p:d:P:D:s:c:t:lC:LuonvhVZ!"
+#define SHORT_OPTIONS "+m:r:p:d:P:D:s:c:t:lC:LuonvhVYZ!"
 static struct option long_options[] =
 {
     {"model",           1, 0, 'm'},
@@ -104,7 +104,7 @@ static struct option long_options[] =
     {"dump-caps",       0, 0, 'u'},
     {"vfo",             0, 0, 'o'},
     {"no-restore-ai",   0, 0, 'n'},
-    {"ignore rig open error", 0, 0, 'Y'},
+    {"ignore-err",      0, 0, 'Y'},
     {"debug-time-stamps", 0, 0, 'Z'},
 #ifdef HAVE_READLINE_HISTORY
     {"read-history",    0, 0, 'i'},
@@ -429,6 +429,7 @@ int main(int argc, char *argv[])
 
         case 'Y':
             ignore_rig_open_error = 1;
+            break;
 
         case 'Z':
             rig_set_debug_time_stamp(1);
@@ -722,7 +723,7 @@ void usage(void)
         "  -I, --save-history            save current interactive session history\n"
 #endif
         "  -v, --verbose                 set verbose mode, cumulative (-v to -vvvvv)\n"
-        "  -Y, --ignore_err              ignore rig_open errors\n"
+        "  -Y, --ignore-err              ignore rig_open errors\n"
         "  -Z, --debug-time-stamps       enable time stamps for debug messages\n"
         "  -h, --help                    display this help and exit\n"
         "  -V, --version                 output version information and exit\n"