diff --git a/lsp-ui-doc.el b/lsp-ui-doc.el
index a3508172..de4c5ddb 100644
--- a/lsp-ui-doc.el
+++ b/lsp-ui-doc.el
@@ -1247,7 +1247,6 @@ It is supposed to be called from `lsp-ui--toggle'"
   (interactive)
   (when-let* ((frame (lsp-ui-doc--get-frame))
               (visible (lsp-ui-doc--frame-visible-p)))
-    (remove-hook 'post-command-hook 'lsp-ui-doc--unfocus-frame-post-command)
     (remove-hook 'post-command-hook 'lsp-ui-doc--hide-frame)
     (set-frame-parameter frame 'lsp-ui-doc--no-focus nil)
     (set-frame-parameter frame 'cursor-type t)
@@ -1264,14 +1263,8 @@ It is supposed to be called from `lsp-ui--toggle'"
     (set-frame-parameter frame 'cursor-type nil)
     (lsp-ui-doc--with-buffer
       (setq cursor-type nil))
-    (if lsp-ui-doc--from-mouse
-        (make-frame-invisible frame)
-      (add-hook'post-command-hook 'lsp-ui-doc--unfocus-frame-post-command))))
-
-(defun lsp-ui-doc--unfocus-frame-post-command ()
-  "Hide frame on the next post command after unfocus frame."
-  (add-hook 'post-command-hook 'lsp-ui-doc--hide-frame)
-  (remove-hook 'post-command-hook 'lsp-ui-doc--unfocus-frame-post-command))
+    (when lsp-ui-doc--from-mouse
+      (make-frame-invisible frame))))
 
 (provide 'lsp-ui-doc)
 ;;; lsp-ui-doc.el ends here