diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
index 47743288ad..ab041fd2f9 100644
--- a/gtk/a11y/gtkwindowaccessible.c
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -113,8 +113,6 @@ gtk_window_accessible_initialize (AtkObject *obj,
     obj->role = ATK_ROLE_FONT_CHOOSER;
   else if (GTK_IS_MESSAGE_DIALOG (widget))
     obj->role = ATK_ROLE_ALERT;
-  else if (GTK_IS_DIALOG (widget))
-    obj->role = ATK_ROLE_DIALOG;
   else
     {
       const gchar *name;
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 931ac617fe..5dfb7791bb 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -241,6 +241,8 @@ gtk_dialog_class_init (GtkDialogClass *class)
   widget_class->map = gtk_dialog_map;
   widget_class->style_updated = gtk_dialog_style_updated;
 
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_DIALOG);
+
   class->close = gtk_dialog_close;
 
   g_type_class_add_private (gobject_class, sizeof (GtkDialogPrivate));