diff --git a/.lvimrc b/.lvimrc
index da4ed2065..a89836669 100644
--- a/.lvimrc
+++ b/.lvimrc
@@ -1,5 +1,5 @@
 map <F4> :wall!<CR>:make all<CR>
-map <F5> :!CCS64.exe durexforth.d64 &<CR>
+map <F5> :!x64.exe durexforth.d64 &<CR>
 
 set nomodeline
 
diff --git a/changelog.txt b/changelog.txt
index 398d114cd..f37d71408 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -336,3 +336,4 @@ Thanks to polluks for suggestions!
 v1.6.5
 
  * editor: slower key repeat settings
+ * editor: made f7 work in insert mode
diff --git a/forth_src/vi.fs b/forth_src/vi.fs
index bf055dd7d..87a0864c4 100755
--- a/forth_src/vi.fs
+++ b/forth_src/vi.fs
@@ -574,12 +574,7 @@ down c, ' cur-down ,
 		key
 		'w' = if change-word then
 	endof
-
-	88 of drop cleanup rom-kernal \ f7
-        bufstart eof @ bufstart - 1-
-        evaluate quit endof endcase
-	0
-;
+endcase 0 ;
 
 : main-loop
 \ init colors -- border bgcol curscol
@@ -607,6 +602,11 @@ show-page
         cursor-scr-pos dup @ 7f and
         swap c!
 
+\ f7
+dup 88 = if 2drop cleanup rom-kernal
+bufstart eof @ bufstart - 1-
+evaluate quit then
+
 		ins-active if
 			ins-handler
 		else
@@ -639,6 +639,7 @@ f eaea c! \ repeat delay
 4 eb1d c! \ repeat speed
 then
 
+0 to ins-active
 80 28a c! \ key repeat on
 clear-status