diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c
index b72a95d3ba..abdb385933 100644
--- a/gtk/a11y/gtkatspicontext.c
+++ b/gtk/a11y/gtkatspicontext.c
@@ -296,6 +296,13 @@ collect_states (GtkAtSpiContext    *self,
         set_atspi_state (&states, ATSPI_STATE_MULTISELECTABLE);
     }
 
+  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_HAS_POPUP))
+    {
+      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_HAS_POPUP);
+      if (gtk_boolean_accessible_value_get (value))
+        set_atspi_state (&states, ATSPI_STATE_HAS_POPUP);
+    }
+
   g_variant_builder_add (builder, "u", (guint32) (states & 0xffffffff));
   g_variant_builder_add (builder, "u", (guint32) (states >> 32));
 }