diff --git a/lib/make/mb_msxpipe.mk b/lib/make/mb_msxpipe.mk
index 2888c35..b84f91e 100644
--- a/lib/make/mb_msxpipe.mk
+++ b/lib/make/mb_msxpipe.mk
@@ -38,11 +38,11 @@ MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_safe_test,"Runs openMS
 
 define _mb_msxpipe_run_gui
 	$(call mb_autoexec_write_default,$(1),$(MB_MSXPIPE_COLOR_FG_RUN_GUI),$(MB_MSXPIPE_COLOR_BG_RUN_GUI))
+	$(if $(filter mouse,$(4)),$(call mb_autoexec_append_joyporta_mouse,$(1)))
 	$(call mb_autoexec_append_stop_fail,$(1))
 	$(call mb_autoexec_append_show_gui,$(1))
-	$(if $(filter mouse,$(4)),$(call mb_autoexec_append_joyporta_mouse,$(1)))
 	$(call mb_autoexec_append_echo,$(1),mb::help Run shutdown to exit)
-	$(if $(2),$(call mb_autoexec_append_echo,$(1),mb::show command $(2)))
+	$(if $(2),$(call mb_autoexec_append_echo,$(1),mb::auto command $(2)))
 	$(if $(2),$(call mb_autoexec_append_cmd,$(1),$(2)))
 	$(call mb_openmsx_dosctl,$(1),$(3))
 endef