diff --git a/core/core-ui.el b/core/core-ui.el
index f8fc6a357..cb03af232 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -587,6 +587,14 @@ frame's window-system, the theme will be reloaded.")
 ;; line numbers in most modes
 (add-hook! (prog-mode text-mode conf-mode) #'doom|enable-line-numbers)
 
+(after! whitespace
+  (defun doom*fix-whitespace-mode-in-childframes (orig-fn &rest args)
+    (with-selected-frame (apply orig-fn args)
+      (setq-local whitespace-style nil)
+      (selected-window)))
+  (advice-add #'company-box--make-frame :around #'doom*fix-whitespace-mode-in-childframes)
+  (advice-add #'posframe--create-posframe :around #'doom*fix-whitespace-mode-in-childframes))
+
 ;; ensure posframe cleans up after itself
 (after! posframe
   ;; TODO Find a better place for this