diff --git a/src/normal.c b/src/normal.c
index d2f41593a0..4299a90df4 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -6944,6 +6944,16 @@ nv_esc(cmdarg_T *cap)
 	}
 #endif
     }
+#ifdef FEAT_CMDWIN
+    else if (cmdwin_type != 0 && ex_normal_busy)
+    {
+	// When :normal runs out of characters while in the command line window
+	// vgetorpeek() will return ESC.  Exit the cmdline window to break the
+	// loop.
+	cmdwin_result = K_IGNORE;
+	return;
+    }
+#endif
 
     if (VIsual_active)
     {
diff --git a/src/version.c b/src/version.c
index 7eb0d057af..3d52e4967c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2548,
 /**/
     2547,
 /**/