diff --git a/init.el b/init.el
index ee743eb..7b8e2e6 100644
--- a/init.el
+++ b/init.el
@@ -49,6 +49,9 @@
           (describe-symbol (cadr form))
         (describe-symbol form))))
 
+  ;; Terminal mouse support
+  (xterm-mouse-mode 1)
+
   ;; Make show paren instant
   (setq show-paren-delay 0)
   (show-paren-mode 1)
@@ -121,6 +124,9 @@
 (use-package evil-surround
   :config
   (global-evil-surround-mode 1))
+(use-package evil-terminal-cursor-changer 
+  :config
+  (evil-terminal-cursor-changer-activate))
 
 ;; which-key
 (use-package which-key
@@ -289,11 +295,14 @@ visual states."
   (setq xref-show-xrefs-function #'consult-xref
   xref-show-definitions-function #'consult-xref))
 
+;; popup.el
+(use-package popup)
+
 ;; flymake
 (use-package flymake
   :bind (:map flymake-mode-map
               ("C-c e" . my/flymake-show-diagnostic-at-point)
-              ("C-c E" . consult-flymake))
+              ("C-c C-e" . consult-flymake))
   :hook (emacs-lisp-mode . my/enable-flymake-mode)
   :init
   (defun my/flymake-show-diagnostic-at-point ()
@@ -302,11 +311,7 @@ visual states."
              (diag (and flymake-mode
                         (get-char-property pos 'flymake-diagnostic)))
              (message (flymake--diag-text diag)))
-        (progn
-          ;; show the frame
-          )))
-  (defun my/-flymake-show-diagnostic-hide-frame ()
-    (make-frame-invisible my/-flymake-show-diagnostic-frame))
+        (popup-tip message)))
   (defun my/enable-flymake-mode ()
     (flymake-mode 1)))