diff --git a/eaf.el b/eaf.el
index d83a176..239a71c 100644
--- a/eaf.el
+++ b/eaf.el
@@ -510,15 +510,12 @@ Please ONLY use `eaf-bind-key' to edit EAF keybindings!"
 (defun eaf-monitor-key-event ()
   "Monitor key events during EAF process."
   (ignore-errors
-    (let* ((event last-command-event)
-           (key (if event
-                    (make-vector 1 event)
-                  (where-is-internal last-command)))
+    (let* ((key (this-command-keys-vector))
            (key-command (symbol-name (key-binding key)))
            (key-desc (key-description key)))
 
       ;; Uncomment for debug.
-      ;; (message (format "!!!!! %s %s %s %s %s" event key key-command key-desc buffer-app-name))
+      ;; (message (format "!!!!! %s %s %s %s %s" key key-command key-desc buffer-app-name))
 
       (cond
         ;; Fix #51 , don't handle F11 to make emacs toggle frame fullscreen status successfully.