diff --git a/vim/scratch.vim b/vim/scratch.vim
new file mode 100644
index 0000000..5449949
--- /dev/null
+++ b/vim/scratch.vim
@@ -0,0 +1,3 @@
+command! -nargs=? Scratch enew
+      \ | set filetype=<args>
+      \ | set buftype=nofile
diff --git a/vim/shame.vim b/vim/shame.vim
index 3a7daed..1e18037 100644
--- a/vim/shame.vim
+++ b/vim/shame.vim
@@ -492,7 +492,6 @@ function! s:snapshot()
 endfun
 command! Snapshot call <sid>snapshot()
 
-command! -nargs=? Scratch enew | call <sid>init_generic_file() | set filetype=<args> | set buftype=nofile
 command! Todo call matchadd('Todo', '^\s*\[ \?\].*$') |
 			\ call matchadd('Comment', '^\s*\[x\].*$') |
 			\ call matchadd('Comment', '^\s*\[-\].*$') |
diff --git a/vimrc b/vimrc
index c4256ad..3dbeec3 100644
--- a/vimrc
+++ b/vimrc
@@ -5,4 +5,5 @@ let &rtp=expand('<sfile>:p:h').'/vim,'.&rtp
 
 run git.vim
 run surround.vim
+run scratch.vim
 run shame.vim