diff --git a/src/edit.c b/src/edit.c
index 070d84c..4f8e374 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1057,6 +1057,9 @@
 	case K_CURSORHOLD:	// Didn't type something for a while.
 	    ins_apply_autocmds(EVENT_CURSORHOLDI);
 	    did_cursorhold = TRUE;
+	    // If CTRL-G U was used apply it to the next typed key.
+	    if (dont_sync_undo == TRUE)
+		dont_sync_undo = MAYBE;
 	    break;
 
 #ifdef FEAT_GUI_MSWIN
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index f769eec..db1efba 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
Binary files differ
diff --git a/src/version.c b/src/version.c
index 0801704..4107767 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3467,
+/**/
     3466,
 /**/
     3465,