diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index b82a7e75..0a3c14a9 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -358,6 +358,8 @@ acmd_wait1:
 	call	cst			; check for keyboard key
 	jr	z,acmd_wait2		; no key, continue
 	call	cin			; get key
+	cp	13			; return key?
+	ret	z			; if so, ret with Z set
 	cp	27			; escape key?
 	jr	nz,acmd_wait1		; loop if not
 	or	$FF			; signal abort
diff --git a/Source/HBIOS/sysconf.asm b/Source/HBIOS/sysconf.asm
index 866c97b5..2cdbc002 100644
--- a/Source/HBIOS/sysconf.asm
+++ b/Source/HBIOS/sysconf.asm
@@ -504,7 +504,7 @@ str_banner	.db	"\r\n"
 MSG_MENU	.DB	"\r\n"
 		.DB	"Commands:\r\n"
 		.DB	"  (P)rint - Display Current settings\r\n"
-		.DB	"  (S)et {SW},{val}[,{val}[,{val}]]- Set a switch value(s)\r\n"
+		.DB	"  (S)et {SW} {val}[,{val}[,{val}]]- Set a switch value(s)\r\n"
 		.DB	"  (R)eset - Init NVRAM to Defaults\r\n"
 		.DB	"  (H)elp [{SW}] - This help menu, or help on a switch\r\n"
 		.DB	"  (Q)uit - Quit\r\n"