diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp
index b17688db53b..31aaf75b47b 100644
--- a/src/frontend/mame/clifront.cpp
+++ b/src/frontend/mame/clifront.cpp
@@ -1458,7 +1458,7 @@ const cli_frontend::info_command_struct *cli_frontend::find_command(const std::s
 		{ CLICOMMAND_LISTCLONES,        0,  1, false,	&cli_frontend::listclones,       "[system name]" },
 		{ CLICOMMAND_LISTBROTHERS,      0,  1, false,	&cli_frontend::listbrothers,     "[system name]" },
 		{ CLICOMMAND_LISTCRC,           0,  1, false,	&cli_frontend::listcrc,          "[system name]" },
-		{ CLICOMMAND_LISTDEVICES,       0,  1, false,	&cli_frontend::listdevices,      "[system name]" },
+		{ CLICOMMAND_LISTDEVICES,       0,  1, true,	&cli_frontend::listdevices,      "[system name]" },
 		{ CLICOMMAND_LISTSLOTS,         0,  1, true,	&cli_frontend::listslots,        "[system name]" },
 		{ CLICOMMAND_LISTROMS,          0, -1, false,	&cli_frontend::listroms,         "[pattern] ..." },
 		{ CLICOMMAND_LISTSAMPLES,       0,  1, false,	&cli_frontend::listsamples,      "[system name]" },
diff --git a/src/frontend/mame/mameopts.cpp b/src/frontend/mame/mameopts.cpp
index 8541abaf515..9a00f1543e2 100644
--- a/src/frontend/mame/mameopts.cpp
+++ b/src/frontend/mame/mameopts.cpp
@@ -359,7 +359,8 @@ bool mame_options::parse_command_line(emu_options &options, std::vector<std::str
 	// out if this is necessary for this particular auxillary verb, and if so, set the system name
 	if (!options.command().empty()
 		&& cli_frontend::parse_slot_options_for_auxverb(options.command())
-		&& !options.command_arguments().empty())
+		&& !options.command_arguments().empty()
+		&& !core_iswildstr(options.command_arguments()[0].c_str()))
 	{
 		std::string error_string;
 		options.set_value(OPTION_SYSTEMNAME, options.command_arguments()[0].c_str(), OPTION_PRIORITY_CMDLINE, error_string);