diff --git a/src/term.c b/src/term.c
index 8df5e02ec7..977987c2b3 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4547,22 +4547,6 @@ check_termcode(
 		    {
 			int need_flush = FALSE;
 
-			/* Only set 'ttymouse' automatically if it was not set
-			 * by the user already. */
-			if (!option_was_set((char_u *)"ttym"))
-			{
-# ifdef TTYM_SGR
-			    if (version >= 277)
-				set_option_value((char_u *)"ttym", 0L,
-							  (char_u *)"sgr", 0);
-			    else
-# endif
-			    /* if xterm version >= 95 use mouse dragging */
-			    if (version >= 95)
-				set_option_value((char_u *)"ttym", 0L,
-						       (char_u *)"xterm2", 0);
-			}
-
 			/* if xterm version >= 141 try to get termcap codes */
 			if (version >= 141)
 			{
@@ -4581,6 +4565,28 @@ check_termcode(
 			     * 256, libvterm supports even more. */
 			    if (mch_getenv((char_u *)"COLORS") == NULL)
 				may_adjust_color_count(256);
+# ifdef FEAT_MOUSE_SGR
+			    /* Libvterm can handle SGR mouse reporting. */
+			    if (!option_was_set((char_u *)"ttym"))
+				set_option_value((char_u *)"ttym", 0L,
+							   (char_u *)"sgr", 0);
+# endif
+			}
+
+			/* Only set 'ttymouse' automatically if it was not set
+			 * by the user already. */
+			if (!option_was_set((char_u *)"ttym"))
+			{
+# ifdef FEAT_MOUSE_SGR
+			    if (version >= 277)
+				set_option_value((char_u *)"ttym", 0L,
+							  (char_u *)"sgr", 0);
+			    else
+# endif
+			    /* if xterm version >= 95 use mouse dragging */
+			    if (version >= 95)
+				set_option_value((char_u *)"ttym", 0L,
+						       (char_u *)"xterm2", 0);
 			}
 
 			/* Detect terminals that set $TERM to something like
diff --git a/src/version.c b/src/version.c
index 65f5a4b03a..f28132cf9a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1258,
 /**/
     1257,
 /**/