diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 6b289dc0..86e8184b 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.DLG.txt b/BIN/EDIT.S.DLG.txt
index b587ddc4..05fb6559 100644
--- a/BIN/EDIT.S.DLG.txt
+++ b/BIN/EDIT.S.DLG.txt
@@ -84,25 +84,8 @@ DLG.Open		>STYA ZPPTR2
 				jsr DLG.DrawBar
 				bcs .9
 
-				ldy #S.DLG.Ctrls
-				
-.5				lda (ZPPTR1),y
-				beq .8
-	
-				phy
-				tya
-				jsr DLG.CTRL.Draw
-				ply
-				bcs .9
+				jmp DLG.CTRL.DrawAll
 
-				iny
-				bra .5
-
-.8				ldy #S.DLG.Focus
-				lda (ZPPTR1),y
-				jsr DLG.CTRL.Focus
-				
-				clc				
 .9				rts				
 *--------------------------------------
 DLG.Run			jsr GetCh
@@ -192,6 +175,27 @@ DLG.Close		ldy #S.DLG.Y
 				clc
 .9				rts				
 *--------------------------------------
+DLG.CTRL.DrawAll
+				ldy #S.DLG.Ctrls
+				
+.5				lda (ZPPTR1),y
+				beq .8
+	
+				phy
+				tya
+				jsr DLG.CTRL.Draw
+				ply
+				bcs .9
+
+				iny
+				bra .5
+
+.8				ldy #S.DLG.Focus
+				lda (ZPPTR1),y
+				jmp DLG.CTRL.Focus
+				
+.9				rts
+*--------------------------------------
 DLG.CTRL.Draw	sta TmpByte				A=CtrlID
 				tay
 				lda (ZPPTR1),y			Ctrl Definition
@@ -574,8 +578,7 @@ DLG.CTRL.GotoEnd
 				
 				tay
 				
-DLG.CTRL.GotoXY
-				>PUSHW LineBufPtr
+DLG.CTRL.GotoXY	>PUSHW LineBufPtr
 				>PUSHW L.MSG.GOTOXY
 				tya
 				inc
@@ -780,8 +783,6 @@ DLG.CTRL.CharIn.OL
 				cmp #C.SPACE
 				bne .8
 
-				phy
-				
 				iny						X
 				iny						Y
 				iny						shortcut
@@ -797,8 +798,7 @@ DLG.CTRL.CharIn.OL
 				ply
 				sta (pData),y
 				
-				pla
-				jsr DLG.CTRL.Draw
+				jmp DLG.CTRL.DrawAll
 				
 .8				clc
 				rts