diff --git a/src/tag.c b/src/tag.c
index e5317b41b3..2df02752cc 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -645,9 +645,11 @@ do_tag (
               break;
             msg_advance(15);
 
-            /* skip backslash used for escaping command char */
-            if (*p == '\\' && *(p + 1) == *tagp.command)
+            // Skip backslash used for escaping a command char or a backslash.
+            if (*p == '\\' && (*(p + 1) == *tagp.command
+                               || *(p + 1) == '\\')) {
               ++p;
+            }
 
             if (*p == TAB) {
               msg_putchar(' ');
diff --git a/src/version.c b/src/version.c
index 595d5a13c3..72cc8cf5d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -221,7 +221,7 @@ static int included_patches[] = {
   //242,
   //241,
   //240,
-  //240,
+  240,
   239,
   //238,
   //237,