diff --git a/runtime/autoload/tutor.vim b/runtime/autoload/tutor.vim
index 9412960195..6f2dd1e602 100644
--- a/runtime/autoload/tutor.vim
+++ b/runtime/autoload/tutor.vim
@@ -185,7 +185,7 @@ function! tutor#TutorCmd(tutor_name)
     endif
 
     call tutor#SetupVim()
-    exe "edit ".l:to_open
+    exe "drop ".l:to_open
     call tutor#EnableInteractive(v:true)
     call tutor#ApplyTransform()
 endfunction
@@ -200,7 +200,7 @@ endfunction
 function! tutor#EnableInteractive(enable)
     let enable = a:enable
     if enable
-        setlocal buftype=nofile
+        setlocal buftype=nowrite
         setlocal concealcursor+=inv
         setlocal conceallevel=2
         lua require('nvim.tutor').apply_marks()
diff --git a/test/old/testdir/test_plugin_tutor.vim b/test/old/testdir/test_plugin_tutor.vim
index 5b85b650e2..6420750238 100644
--- a/test/old/testdir/test_plugin_tutor.vim
+++ b/test/old/testdir/test_plugin_tutor.vim
@@ -11,7 +11,7 @@ endfunc
 
 func Test_auto_enable_interactive()
   Tutor
-  call assert_equal('nofile', &buftype)
+  call assert_equal('nowrite', &buftype)
   call assert_match('tutor#EnableInteractive', b:undo_ftplugin)
 
   edit Xtutor/Xtest.tutor