diff --git a/init.el b/init.el
index aac8bc9..d427c1c 100644
--- a/init.el
+++ b/init.el
@@ -321,6 +321,7 @@ DOCSTRING is an optional form that is discarded upon expansion."
   (fill-column 80 "Set default line-wrap column to column 80")
   (max-mini-window-height 10 "Limit minibuffer height to 10 lines")
   (enable-recursive-minibuffers t "Allow minibuffer commands to be called in the minibuffer")
+  (x-gtk-use-system-tooltips nil "Disable use of system tooltips in favor of Emacs tooltips.")
   (load-prefer-newer t "Load from source files if they are newer than bytecode files")
 
   ;; Startup
@@ -363,6 +364,9 @@ DOCSTRING is an optional form that is discarded upon expansion."
   ;; focus a window already displaying the buffer, else display buffer in current window
   (display-buffer-base-action '((display-buffer-reuse-window display-buffer-same-window)))
 
+  ;; Set default tooltip frame parameters
+  (tooltip-frame-parameters '((name . "tooltip") (border-width . 1) (internal-border-width . 10)))
+
   ;; Filter out buffer-incompatible interactive commands by default
   (read-extended-command-predicate #'command-completion-default-include-p)