diff --git a/src/buffer.c b/src/buffer.c
index 7f0c106..f4713a1 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1441,6 +1441,8 @@
 enter_buffer(buf)
     buf_T	*buf;
 {
+    long old_tw = curbuf->b_p_tw;
+
     /* Copy buffer and window local option values.  Not for a help buffer. */
     buf_copy_options(buf, BCO_ENTER | BCO_NOHELP);
     if (!buf->b_help)
@@ -1464,6 +1466,8 @@
 
 #ifdef FEAT_SYN_HL
     curwin->w_s = &(buf->b_s);
+    if (old_tw != buf->b_p_tw)
+	check_colorcolumn(curwin);
 #endif
 
     /* Cursor on first line by default. */
diff --git a/src/version.c b/src/version.c
index 2f17d2c..7689b56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    799,
+/**/
     798,
 /**/
     797,