diff --git a/src/nmtui/nmt-editor.c b/src/nmtui/nmt-editor.c
index 427ac0178b..0fef4e6c3e 100644
--- a/src/nmtui/nmt-editor.c
+++ b/src/nmtui/nmt-editor.c
@@ -107,6 +107,8 @@ nmt_editor_new(NMConnection *connection)
                         _("Edit Connection"),
                         "fullscreen-vertical",
                         TRUE,
+                        "escape-exits",
+                        TRUE,
                         NULL);
 }
 
diff --git a/src/nmtui/nmtui-edit.c b/src/nmtui/nmtui-edit.c
index ec80a20359..954b0cc26d 100644
--- a/src/nmtui/nmtui-edit.c
+++ b/src/nmtui/nmtui-edit.c
@@ -398,7 +398,12 @@ nmt_add_connection(void)
 {
     NmtNewtForm *form;
 
-    form = g_object_new(NMT_TYPE_ADD_CONNECTION, "title", _("New Connection"), NULL);
+    form = g_object_new(NMT_TYPE_ADD_CONNECTION,
+                        "title",
+                        _("New Connection"),
+                        "escape-exits",
+                        TRUE,
+                        NULL);
     nmt_newt_form_show(form);
     g_object_unref(form);
 }