diff --git a/NvimView/NvimServer/server_ui.m b/NvimView/NvimServer/server_ui.m
index cbbc78fd..3fcaff81 100644
--- a/NvimView/NvimServer/server_ui.m
+++ b/NvimView/NvimServer/server_ui.m
@@ -622,15 +622,25 @@ void custom_ui_autocmds_groups(
     buf_T *buf,
     exarg_T *eap __unused
 ) {
-  // We don't need these events in the UI (yet) and they slow down scrolling: Enable them,
-  // if necessary, only after optimizing the scrolling.
-  if (event == EVENT_CURSORMOVED || event == EVENT_CURSORMOVEDI) {
-    return;
+  switch (event) {
+    case EVENT_BUFENTER:
+    case EVENT_BUFLEAVE:
+    case EVENT_BUFWINENTER:
+    case EVENT_BUFWINLEAVE:
+    case EVENT_BUFWRITEPOST:
+    case EVENT_COLORSCHEME:
+    case EVENT_DIRCHANGED:
+    case EVENT_TABENTER:
+    case EVENT_TEXTCHANGED:
+    case EVENT_TEXTCHANGEDI:
+      break;
+
+    default:
+      return;
   }
 
+  DLOG("got event %d for file %s in group %d.", event, fname, group);
   @autoreleasepool {
-    DLOG("got event %d for file %s in group %d.", event, fname, group);
-
     if (event == EVENT_DIRCHANGED) {
       send_cwd();
       return;
diff --git a/NvimView/NvimView/NvimView+UiBridge.swift b/NvimView/NvimView/NvimView+UiBridge.swift
index 39b32492..6b747f50 100644
--- a/NvimView/NvimView/NvimView+UiBridge.swift
+++ b/NvimView/NvimView/NvimView+UiBridge.swift
@@ -173,6 +173,7 @@ extension NvimView {
   }
 
   func autoCommandEvent(_ event: NvimAutoCommandEvent, bufferHandle: Int) {
+    // white-list used AUs in custom_ui_autocmds_groups() in server_ui.m
     self.bridgeLogger.debug("\(event) -> \(bufferHandle)")
 
     if event == .bufwinenter || event == .bufwinleave {