diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index 8304efdb..fa555761 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -530,19 +530,51 @@ Prompt.Save		cmp #3
 				ldy #PromptMode
 				lda #0
 				sta (pData),y
-				jsr UpdateStatusBar
-				bcs .9
-				rts
+				bra .80
 				
 .1				cmp #13
 				bne .2
 				
+				lda (pData)
+				beq .8
 				
-.2				
+				ldy #PromptMode
+				lda #0
+				sta (pData),y
+				bra .80
+				
+.2				cmp #127
+				bne .3
+				
+				lda (pData)
+				beq .8
+				
+				dec
+				sta (pData)
+				bra .80
+				
+.3				>DEBUG
+				cmp #$20
+				bcc .8
+				pha
+				lda (pData)
+				tay
+				pla
+				cpy #PromptBufferMax
+				beq .8
+				iny
+				sta (pData),y
+				tya
+				sta (pData)
+				bra .80
 				
 .8				clc
 				rts				
 
+.80				jsr UpdateStatusBar
+				bcs .9
+				rts
+				
 .9				jmp Ctrl.Q
 *--------------------------------------
 MAN
diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt
index 021f9856..d8b8ccb8 100644
--- a/BIN/EDIT.S.SCRN.txt
+++ b/BIN/EDIT.S.SCRN.txt
@@ -240,7 +240,6 @@ UpdateStatusBar ldy #PromptMode
 .2				>PUSHW pData
 				ldy #ScreenH
 				lda (pData),y
-				dec
 				>PUSHA
 				>LDYA L.MSG.STATUSBAR,x
 				>SYSCALL SYS.PSTRoutYA