diff --git a/c64/basic/basic_execute_line.s b/c64/basic/basic_execute_line.s
index 99033e14..a7689e51 100644
--- a/c64/basic/basic_execute_line.s
+++ b/c64/basic/basic_execute_line.s
@@ -28,6 +28,10 @@ no_space_to_skip:
 
 basic_execute_statement:
 
+	;; Check for RUN/STOP
+	lda BUCKYSTATUS
+	bpl basic_do_break
+	
 	;; Skip over any white space and :
 	ldy #0
 	ldx #<basic_current_statement_ptr
diff --git a/c64/basic/cmd_list.s b/c64/basic/cmd_list.s
index 2d3f02c8..06110830 100644
--- a/c64/basic/cmd_list.s
+++ b/c64/basic/cmd_list.s
@@ -21,14 +21,30 @@ list_loop:
 	;; (Confirmed by testing on a C64)
 	jmp basic_main_loop
 
-list_break:
+basic_do_break:
 	jsr printf
-	.byte "BREAK",$0d,0
+	.byte "BREAK",0
+
+	;; Check for direct mode
+	;; Are we in direct mode
+	lda basic_current_line_number+1
+	cmp #$ff
+	beq +
+	;; Not direct mode
+	jsr printf
+	.byte " IN ",0
+	lda basic_current_line_number+1
+	ldx basic_current_line_number+0
+	jsr print_integer
+	
+*
+	lda #$0d
+	jsr $ffd2
 	jmp basic_main_loop
 	
 list_more_lines:
 	lda BUCKYSTATUS
-	bpl list_break
+	bpl basic_do_break
 	
 	;; Print line number
 	ldy #3