diff --git a/README.md b/README.md
index f22c6c00..17bc9fb4 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,7 @@ computational environment for Jupyter, supporting interactive data science and s
 - [**Juno**](http://junolab.org/): A flexible Julia IDE, based on Atom.
 - [**webssh**](https://github.com/huashengdun/webssh): Web based ssh client.
 - [**info-beamer hosted**](https://info-beamer.com): Uses Xterm.js to manage digital signage devices from the web dashboard.
+- [**Jumpserver**](https://github.com/jumpserver/luna): Jumpserver Luna project, Jumpserver is a bastion server project, Luna use xterm.js for web terminal emulation. 
 
 [And much more...](https://github.com/xtermjs/xterm.js/network/dependents)
 
diff --git a/src/CompositionHelper.ts b/src/CompositionHelper.ts
index 31ad866b..840bef55 100644
--- a/src/CompositionHelper.ts
+++ b/src/CompositionHelper.ts
@@ -203,6 +203,8 @@ export class CompositionHelper {
       this._compositionView.style.top = cursorTop + 'px';
       this._compositionView.style.height = cellHeight + 'px';
       this._compositionView.style.lineHeight = cellHeight + 'px';
+      this._compositionView.style.fontFamily = this._terminal.options.fontFamily;
+      this._compositionView.style.fontSize = this._terminal.options.fontSize + 'px';
       // Sync the textarea to the exact position of the composition view so the IME knows where the
       // text is.
       const compositionViewBounds = this._compositionView.getBoundingClientRect();
diff --git a/src/xterm.css b/src/xterm.css
index 24cd475f..2e47b1a1 100644
--- a/src/xterm.css
+++ b/src/xterm.css
@@ -36,7 +36,6 @@
  */
 
 .xterm {
-    font-family: courier-new, courier, monospace;
     font-feature-settings: "liga" 0;
     position: relative;
     user-select: none;