diff --git a/keymap/vim.js b/keymap/vim.js
index 78046f59f9a14cf55929513271c6ea7c44cbf11a..913e3a63fd4563279aa08d68d10b8a01465df9ea 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3792,8 +3792,13 @@
       });
     }
     function clearSearchHighlight(cm) {
+      var state = getSearchState(cm);
       cm.removeOverlay(getSearchState(cm).getOverlay());
-      getSearchState(cm).setOverlay(null);
+      state.setOverlay(null);
+      if (state.getScrollbarAnnotate()) {
+        state.getScrollbarAnnotate().clear();
+        state.setScrollbarAnnotate(null);
+      }
     }
     /**
      * Check if pos is in the specified range, INCLUSIVE.