diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8463311fc0..9efabbd0a4 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -8481,8 +8481,8 @@ gtk_entry_set_icon_tooltip_text (GtkEntry             *entry,
 
   priv = entry->priv;
 
-  if (!(icon_info = priv->icons[icon_pos]))
-    icon_info = priv->icons[icon_pos];
+  if ((icon_info = priv->icons[icon_pos]) == NULL)
+    icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
 
   if (icon_info->tooltip)
     g_free (icon_info->tooltip);
@@ -8561,8 +8561,8 @@ gtk_entry_set_icon_tooltip_markup (GtkEntry             *entry,
 
   priv = entry->priv;
 
-  if (!(icon_info = priv->icons[icon_pos]))
-    icon_info = priv->icons[icon_pos];
+  if ((icon_info = priv->icons[icon_pos]) == NULL)
+    icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
 
   if (icon_info->tooltip)
     g_free (icon_info->tooltip);