diff --git a/src/message.c b/src/message.c
index 9ecd194..0b690bb 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2080,7 +2080,7 @@
 		      || (has_mbyte && (*mb_ptr2cells)(s) > 1 && msg_col <= 2))
 		    :
 #endif
-		      (msg_col + t_col >= Columns - 1
+		      ((*s != '\r' && msg_col + t_col >= Columns - 1)
 		       || (*s == TAB && msg_col + t_col >= ((Columns - 1) & ~7))
 		       || (has_mbyte && (*mb_ptr2cells)(s) > 1
 					 && msg_col + t_col >= Columns - 2)))))
diff --git a/src/testdir/dumps/Test_long_file_name_1.dump b/src/testdir/dumps/Test_long_file_name_1.dump
new file mode 100644
index 0000000..46fa9bd
--- /dev/null
+++ b/src/testdir/dumps/Test_long_file_name_1.dump
@@ -0,0 +1,8 @@
+> +0&#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|<+0#0000000&|x@64|"| |0|L|,| |0|C| 
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index a25d2cf..4ef361e 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -181,3 +181,21 @@
   call StopVimInTerminal(buf)
   call delete(filename)
 endfunc
+
+" check a long file name does not result in the hit-enter prompt
+func Test_edit_long_file_name()
+  CheckScreendump
+
+  let longName = 'x'->repeat(&columns)
+  call writefile([], longName)
+  let buf = RunVimInTerminal('-N -u NONE ' .. longName, #{rows: 8})
+
+  call VerifyScreenDump(buf, 'Test_long_file_name_1', {})
+
+  call term_sendkeys(buf, ":q\<cr>")
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete(longName)
+endfunc
+
diff --git a/src/version.c b/src/version.c
index ecdcb9c..2b992df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2419,
+/**/
     2418,
 /**/
     2417,