diff --git a/src/xfns.c b/src/xfns.c
index a5431aa890..a8cdd66b57 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -6748,7 +6748,8 @@ x_hide_tip (bool delete)

       /* Reset tip_last_frame, it will be reassigned when showing the
 	 next GTK+ system tooltip.  */
-      tip_last_frame = Qnil;
+      if (x_gtk_use_system_tooltips)
+	tip_last_frame = Qnil;

       /* Now look whether there's an Emacs tip around.  */
       if (FRAMEP (tip_frame))