diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 04ae4a98b0..8e5797fbaf 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1127,6 +1127,8 @@ gtk_dialog_set_default_response (GtkDialog *dialog,
 	  gtk_widget_grab_default (widget);
           gtk_style_context_add_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_SUGGESTED_ACTION);
         }
+      else
+        gtk_style_context_remove_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_SUGGESTED_ACTION);
 
       tmp_list = g_list_next (tmp_list);
     }