diff --git a/panels/datetime/cc-tz-dialog.c b/panels/datetime/cc-tz-dialog.c
index 54dddcb97..76dcf70ea 100644
--- a/panels/datetime/cc-tz-dialog.c
+++ b/panels/datetime/cc-tz-dialog.c
@@ -224,6 +224,8 @@ cc_tz_dialog_class_init (CcTzDialogClass *klass)
                   0, NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gnome/control-center/"
                                                "datetime/cc-tz-dialog.ui");
diff --git a/panels/firmware-security/cc-firmware-security-boot-dialog.c b/panels/firmware-security/cc-firmware-security-boot-dialog.c
index bf8a0e755..48f602989 100644
--- a/panels/firmware-security/cc-firmware-security-boot-dialog.c
+++ b/panels/firmware-security/cc-firmware-security-boot-dialog.c
@@ -42,6 +42,8 @@ cc_firmware_security_boot_dialog_class_init (CcFirmwareSecurityBootDialogClass *
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/firmware-security/cc-firmware-security-boot-dialog.ui");
   gtk_widget_class_bind_template_child (widget_class, CcFirmwareSecurityBootDialog, secure_boot_title);
   gtk_widget_class_bind_template_child (widget_class, CcFirmwareSecurityBootDialog, secure_boot_icon);
diff --git a/panels/firmware-security/cc-firmware-security-dialog.c b/panels/firmware-security/cc-firmware-security-dialog.c
index 50657fcb5..40fb306ed 100644
--- a/panels/firmware-security/cc-firmware-security-dialog.c
+++ b/panels/firmware-security/cc-firmware-security-dialog.c
@@ -400,6 +400,8 @@ cc_firmware_security_dialog_class_init (CcFirmwareSecurityDialogClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/firmware-security/cc-firmware-security-dialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcFirmwareSecurityDialog, firmware_security_dialog_icon);
diff --git a/panels/firmware-security/cc-firmware-security-help-dialog.c b/panels/firmware-security/cc-firmware-security-help-dialog.c
index 0a6034f58..820751899 100644
--- a/panels/firmware-security/cc-firmware-security-help-dialog.c
+++ b/panels/firmware-security/cc-firmware-security-help-dialog.c
@@ -39,6 +39,8 @@ cc_firmware_security_help_dialog_class_init (CcFirmwareSecurityHelpDialogClass *
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/firmware-security/cc-firmware-security-help-dialog.ui");
 }
 
diff --git a/panels/keyboard/cc-keyboard-shortcut-dialog.c b/panels/keyboard/cc-keyboard-shortcut-dialog.c
index 78d0d7bed..d1335ec70 100644
--- a/panels/keyboard/cc-keyboard-shortcut-dialog.c
+++ b/panels/keyboard/cc-keyboard-shortcut-dialog.c
@@ -518,6 +518,8 @@ cc_keyboard_shortcut_dialog_class_init (CcKeyboardShortcutDialogClass *klass)
   object_class->constructed = cc_keyboard_shortcut_dialog_constructed;
   object_class->finalize = cc_keyboard_shortcut_dialog_finalize;
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gnome/control-center/"
                                                "keyboard/cc-keyboard-shortcut-dialog.ui");
diff --git a/panels/mouse/cc-mouse-test.c b/panels/mouse/cc-mouse-test.c
index ac349568b..bbefdfc5a 100644
--- a/panels/mouse/cc-mouse-test.c
+++ b/panels/mouse/cc-mouse-test.c
@@ -142,6 +142,8 @@ cc_mouse_test_class_init (CcMouseTestClass *klass)
 
     object_class->finalize = cc_mouse_test_finalize;
 
+    gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
     gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/mouse/cc-mouse-test.ui");
 
     gtk_widget_class_bind_template_child (widget_class, CcMouseTest, arrow_down);
diff --git a/panels/region/cc-format-chooser.c b/panels/region/cc-format-chooser.c
index 81f14a064..df6987d3e 100644
--- a/panels/region/cc-format-chooser.c
+++ b/panels/region/cc-format-chooser.c
@@ -463,6 +463,8 @@ cc_format_chooser_class_init (CcFormatChooserClass *klass)
 
         g_type_ensure (CC_TYPE_FORMAT_PREVIEW);
 
+        gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
         gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/region/cc-format-chooser.ui");
 
         gtk_widget_class_bind_template_child (widget_class, CcFormatChooser, title_bar);
diff --git a/panels/sound/cc-alert-chooser-window.c b/panels/sound/cc-alert-chooser-window.c
index 0d4e406c6..b10323587 100644
--- a/panels/sound/cc-alert-chooser-window.c
+++ b/panels/sound/cc-alert-chooser-window.c
@@ -267,6 +267,8 @@ cc_alert_chooser_window_class_init (CcAlertChooserWindowClass *klass)
 
   object_class->dispose = cc_alert_chooser_window_dispose;
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/sound/cc-alert-chooser-window.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcAlertChooserWindow, none_button);
diff --git a/panels/user-accounts/cc-fingerprint-dialog.c b/panels/user-accounts/cc-fingerprint-dialog.c
index 2d7e4fb08..bd3229354 100644
--- a/panels/user-accounts/cc-fingerprint-dialog.c
+++ b/panels/user-accounts/cc-fingerprint-dialog.c
@@ -1468,6 +1468,8 @@ cc_fingerprint_dialog_class_init (CcFingerprintDialogClass *klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GtkWindowClass *window_class = GTK_WINDOW_CLASS (klass);
 
+  gtk_widget_class_add_binding_action (widget_class, GDK_KEY_Escape, 0, "window.close", NULL);
+
   gtk_widget_class_set_template_from_resource (widget_class,
     "/org/gnome/control-center/user-accounts/cc-fingerprint-dialog.ui");