diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 04b9fafb..4b43dc1e 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index 5e994169..29a96a14 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -271,9 +271,18 @@ Ctrl.CR			jsr BUF.ComputeCOffset
 				>LDYA L.SEQ.CEOL
 				>SYSCALL printf
 				bcs .9
-				
-				>INCW.G FileY
+
 				>STZ.G FileX
+				>LDA.G CurY
+				inc
+			>DEBUG
+				>CMP.G ViewPortHm1
+				beq .8					Bottom line, all done
+				
+				>STA.G CurY
+				dec
+				>CMP.G ViewPortHm1
+				beq .1					No scoll needed
 				
 				>LDA.G ScreenH
 				dec
@@ -287,16 +296,16 @@ Ctrl.CR			jsr BUF.ComputeCOffset
 				>SYSCALL printf
 				bcs .9
 
-				jsr SCRN.UpdateCurrentLine
-				
 				>LDA.G ScreenH
 				dec
 				>PUSHA
 				>PUSHBI 1
 				>LDYA L.SEQ.SCROLLRGN
 				>SYSCALL printf
-								
+				
+.1				jsr SCRN.UpdateCurrentLine
 
+.8				clc
 .9				rts
 *--------------------------------------
 Ctrl.O			ldy #FileY+1