diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 4c653ff5e6..54fb6aba1c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10954,7 +10954,7 @@ arg_all(void)
 #ifndef BACKSLASH_IN_FILENAME
 			    || *p == '\\'
 #endif
-			    )
+			    || *p == '`')
 		    {
 			/* insert a backslash */
 			if (retval != NULL)
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index ab2fe7c824..651f1f8fa4 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1375,6 +1375,14 @@ func Test_edit_complete_very_long_name()
   set swapfile&
 endfunc
 
+func Test_edit_backtick()
+  next a\`b c
+  call assert_equal('a`b', expand('%'))
+  next
+  call assert_equal('c', expand('%'))
+  call assert_equal('a\`b c', expand('##'))
+endfunc
+
 func Test_edit_quit()
   edit foo.txt
   split
diff --git a/src/version.c b/src/version.c
index cf7fa29ce6..4ea5c75bf9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -798,6 +798,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    219,
 /**/
     218,
 /**/