diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt
index 37bbb0f2..7883095e 100644
--- a/BIN/LS.S.txt
+++ b/BIN/LS.S.txt
@@ -13,7 +13,6 @@ AUTO 6
 *--------------------------------------
 MAX.COL			.EQ 4
 MAX.RECURSE		.EQ 8
-X.MSG.ENTER		.EQ 1
 *--------------------------------------
 ZPPtr1			.EQ ZPBIN
 ZPPtr2			.EQ ZPBIN+2
@@ -191,7 +190,10 @@ CS.RUN.DEV		ldy #bLong
 				bpl .8
 				
 				>LDYA ZPPtr1
-				jmp EnterSubDirYA
+				jsr EnterSubDirYA
+				bcs .9
+				jsr CS.RUN.ENTER.MSG
+				bcs .9
 				
 .8				clc				
 .9				rts
@@ -259,7 +261,10 @@ CS.RUN.DIR		ldy #bAllmostAll
 				bcs .9
 				
 				>LDYA ZPPtr1
-				jmp EnterSubDirYA
+				jsr EnterSubDirYA
+				bcs .9
+				jsr CS.RUN.ENTER.MSG
+				bcs .9
 				
 .8				clc
 .9				rts
@@ -359,6 +364,15 @@ CS.RUN.NewLine.8
 				clc
 				rts
 *--------------------------------------
+CS.RUN.ENTER.MSG
+				ldy #hBasePath
+				lda (pData),y
+				>SYSCALL GetMemPtrA
+				>PUSHYA
+				>LDYA L.MSG.ENTER
+				>SYSCALL PrintFYA
+				rts
+*--------------------------------------
 CS.DOEVENT		ldy #S.EVT.hDEV		is Event from active IN device?
 				lda (pEvent),y
 				ldy #S.PS.hINDEV
@@ -441,7 +455,7 @@ FileType2PSTR	ldy #0
 				adc #0
 				rts
 *--------------------------------------
-				.INB BIN/X.CPLSMVRM.S
+				.INB BIN/X.FILEENUM.S
 *--------------------------------------
 CS.END
 *--------------------------------------
diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt
index 8853fe81..8cb7a492 100644
--- a/BIN/RM.S.txt
+++ b/BIN/RM.S.txt
@@ -12,7 +12,6 @@ AUTO 6
 				.INB /A2OSX.DEV/INC/A2OSX.I
 *--------------------------------------
 MAX.RECURSE		.EQ 8
-X.MSG.ENTER		.EQ 0
 *--------------------------------------
 ZPPtr1			.EQ ZPBIN
 ZPPtr2			.EQ ZPBIN+2
@@ -316,7 +315,7 @@ CS.QUIT			jsr LeaveSubDir
 .3				clc
 				rts
 *--------------------------------------
-				.INB BIN/X.CPLSMVRM.S
+				.INB BIN/X.FILEENUM.S
 *--------------------------------------
 CS.END
 *--------------------------------------
diff --git a/BIN/X.CPLSMVRM.S.txt b/BIN/X.FILEENUM.S.txt
similarity index 93%
rename from BIN/X.CPLSMVRM.S.txt
rename to BIN/X.FILEENUM.S.txt
index ea2cc6f2..f51ebabf 100644
--- a/BIN/X.CPLSMVRM.S.txt
+++ b/BIN/X.FILEENUM.S.txt
@@ -307,6 +307,5 @@ BasePath..		ldy #hBasePath
 				rts
 *--------------------------------------
 MAN
-SAVE BIN/X.CPLSMVRM.S
-LOAD BIN/LS.S
-ASM
+SAVE BIN/X.FILEENUM.S
+