diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c079c47..ffc0b483 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.1.0
 
 * show node version on nodes overview, fixes [#260](https://github.com/cars10/elasticvue/issues/260)
+* add vim mode in editor, thanks @fqdeng, fixes [#253](https://github.com/cars10/elasticvue/pull/253)
 * update to vue `3.5`
 
 ## 1.0.11
diff --git a/src/assets/stylesheets/theme/components/code_editor.css b/src/assets/stylesheets/theme/components/code_editor.css
index f1ac7e2d..ce8793ae 100644
--- a/src/assets/stylesheets/theme/components/code_editor.css
+++ b/src/assets/stylesheets/theme/components/code_editor.css
@@ -128,3 +128,28 @@
 .cm-editor .cm-tooltip-autocomplete > ul > li[aria-selected] {
   background-color: var(--code-editor-tooltip-selected-background);
 }
+
+/* vim */
+.cm-vimMode .cm-cursorLayer:not(.cm-vimCursorLayer) {
+  display: none;
+}
+
+.cm-vim-panel {
+  padding: 0 10px;
+  font-family: monospace;
+  min-height: 1.3em;
+}
+
+.cm-vim-panel input {
+  border: none;
+  outline: none;
+  background-color: inherit;
+  color: inherit;
+}
+
+.light .cm-searchMatch {
+}
+
+.dark .cm-searchMatch {
+}
+
diff --git a/src/composables/CodeEditor.ts b/src/composables/CodeEditor.ts
index 901fd6d9..d73496d8 100644
--- a/src/composables/CodeEditor.ts
+++ b/src/composables/CodeEditor.ts
@@ -1,7 +1,7 @@
 import { onMounted, Ref, watch } from 'vue'
 import { EditorView, basicSetup } from 'codemirror'
 import { KeyBinding, keymap } from '@codemirror/view'
-import { Compartment , Extension, Prec } from '@codemirror/state'
+import { Compartment, Prec } from '@codemirror/state'
 import { indentWithTab } from '@codemirror/commands'
 import { json } from '@codemirror/lang-json'
 import { baseTheme } from './CodeEditor/theme.ts'
@@ -79,9 +79,7 @@ export const useCodeEditor = (editorRef: Ref<HTMLElement | null>, {
       emit('update:modelValue', editorValue())
     })
 
-    const vimExtension = vim();
-    //fix dark theme can't see cursor and letters
-    customizeVimTheme(vimExtension);
+    const vimExtension = vim()
     codeMirrorEditor = new EditorView({
       extensions: [
         // make sure vim is included before other keymaps
@@ -128,27 +126,3 @@ export const useCodeEditor = (editorRef: Ref<HTMLElement | null>, {
     beautifyEditorValue
   }
 }
-
-// I don't know how to customize the font color of the vim panel,
-// seems like they don't have provided a way to change the CSS
-// so I just let font color inherit
-function customizeVimTheme(vimInstance: Extension) {
-  (vimInstance as Extension[])[0] = EditorView.baseTheme({
-    '.cm-vimMode .cm-cursorLayer:not(.cm-vimCursorLayer)': {
-      display: 'none',
-    },
-    '.cm-vim-panel': {
-      padding: '0px 10px',
-      fontFamily: 'monospace',
-      minHeight: '1.3em',
-    },
-    '.cm-vim-panel input': {
-      border: 'none',
-      outline: 'none',
-      backgroundColor: 'inherit',
-      color: 'inherit', // it works with editor global theme
-    },
-    '&light .cm-searchMatch': {backgroundColor: '#ffff0054'},
-    '&dark .cm-searchMatch': {backgroundColor: '#00ffff8a'},
-  })
-}