diff --git a/CHANGES.md b/CHANGES.md
index b594e03..a0b87c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,8 @@
 
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
 
+- Move test to disable plugin in Vim/Neovim, which speeds up loading (#2896)
+
 ### Output
 
 <!-- Changes to Black's terminal output and error messages -->
diff --git a/plugin/black.vim b/plugin/black.vim
index dbe236b..3fc11fe 100644
--- a/plugin/black.vim
+++ b/plugin/black.vim
@@ -15,6 +15,10 @@
 "  1.2:
 "    - use autoload script
 
+if exists("g:load_black")
+  finish
+endif
+
 if v:version < 700 || !has('python3')
     func! __BLACK_MISSING()
         echo "The black.vim plugin requires vim7.0+ with Python 3.6 support."
@@ -25,10 +29,6 @@ if v:version < 700 || !has('python3')
     finish
 endif
 
-if exists("g:load_black")
-  finish
-endif
-
 let g:load_black = "py1.0"
 if !exists("g:black_virtualenv")
   if has("nvim")