diff --git a/src/frame.c b/src/frame.c
index 4dd8bb1804..e5bf21bd3f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2011,6 +2011,12 @@ delete_frame (Lisp_Object frame, Lisp_Object force)

   /* At this point, we are committed to deleting the frame.
      There is no more chance for errors to prevent it.  */
+
+  /* Hide any pending tooltip (Bug#41239) unless FRAME itself is a
+     tooltip frame.  */
+  if (!is_tooltip_frame)
+    Fx_hide_tip ();
+
   minibuffer_selected = EQ (minibuf_window, selected_window);
   sf = SELECTED_FRAME ();
   /* Don't let the frame remain selected.  */