diff --git a/src/moepkg/editorstatus.nim b/src/moepkg/editorstatus.nim
index 48b67c984..8246983aa 100644
--- a/src/moepkg/editorstatus.nim
+++ b/src/moepkg/editorstatus.nim
@@ -276,11 +276,11 @@ proc update*(status: var EditorStatus) =
         ## Update highlight
         ## TODO: Refactor and fix
         if (currentMode != Mode.filer) and not (currentMode == Mode.ex and prevMode == Mode.filer):
-          status.updateHighlight(node)
           if isCurrentMainWin:
             if status.settings.highlightOtherUsesCurrentWord: status.highlightOtherUsesCurrentWord
             if isVisualMode or isVisualBlockMode: status.highlightSelectedArea
             if status.settings.highlightPairOfParen: status.highlightPairOfParen
+          status.updateHighlight(node)
 
         let
           startSelectedLine = bufStatus.selectArea.startLine