diff --git a/i3-sensible-editor b/i3-sensible-editor
index ad3f6bddb..dc95865de 100755
--- a/i3-sensible-editor
+++ b/i3-sensible-editor
@@ -9,7 +9,7 @@
 # mechanism to find the preferred editor
 
 # Hopefully one of these is installed (no flamewars about preference please!):
-for editor in "$VISUAL" "$EDITOR" nano nvim vim vi emacs pico qe mg jed gedit mcedit; do
+for editor in "$VISUAL" "$EDITOR" nano nvim vim vi emacs pico qe mg jed gedit mcedit gvim; do
     if command -v "$editor" > /dev/null 2>&1; then
         exec "$editor" "$@"
     fi
diff --git a/man/i3-sensible-editor.man b/man/i3-sensible-editor.man
index effae6c06..4f16d6c1e 100644
--- a/man/i3-sensible-editor.man
+++ b/man/i3-sensible-editor.man
@@ -30,6 +30,7 @@ It tries to start one of the following (in that order):
 * jed
 * gedit
 * mcedit
+* gvim
 
 Please don’t complain about the order: If the user has any preference, they will
 have $VISUAL or $EDITOR set.