diff --git a/core/core-evil.el b/core/core-evil.el
index 2069d840d..e184881c1 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -106,6 +106,11 @@
                 (setq narf-popup-windows (delq w narf-popup-windows))))
             narf-popup-windows))
 
+    ;; Fix disruptive errors w/ hidden buffers caused by workgroups killing windows
+    ;; TODO Delete timer on dead windows
+    (defadvice evil-ex-hl-do-update-highlight (around evil-ex-hidden-buffer-ignore-errors activate)
+      (ignore-errors ad-do-it))
+
     ;; Hide keystroke display while isearch is active
     (add-hook! isearch-mode     (setq echo-keystrokes 0))
     (add-hook! isearch-mode-end (setq echo-keystrokes 0.02))