diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 86c301c8de..eb8dea45b6 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -5167,12 +5167,8 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
 					const gchar  *tagname,
 					gpointer     *data)
 {
-  if (strcmp (tagname, "attributes") == 0)
-    _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
-					       data);
-  else
-    parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
-					    data);
+  if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data))
+    parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname, data);
 }
 
 static GObject *