diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index f9c07ccdbd..538b788eda 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -605,6 +605,9 @@ get_security_type (NMEditorWirelessSecurityMethodBinding *binding)
 	    || !strcmp (key_mgmt, "wpa-psk"))
 		return "wpa-personal";
 
+	if (!strcmp (key_mgmt, "sae"))
+		return "wpa3-personal";
+
 	if (!strcmp (key_mgmt, "wpa-eap"))
 		return "wpa-enterprise";
 
@@ -709,6 +712,12 @@ wireless_security_target_changed (GObject    *object,
 		              NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, NULL,
 		              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_UNKNOWN,
 		              NULL);
+	} else if (!strcmp (method, "wpa3-personal")) {
+		g_object_set (binding->s_wsec,
+		              NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "sae",
+		              NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, NULL,
+		              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_WEP_KEY_TYPE_UNKNOWN,
+		              NULL);
 	} else if (!strcmp (method, "wpa-enterprise")) {
 		g_object_set (binding->s_wsec,
 		              NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap",
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index a104e76021..d5e7dc2ec5 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -78,6 +78,7 @@ static NmtNewtPopupEntry wifi_band[] = {
 static NmtNewtPopupEntry wifi_security[] = {
 	{ NC_("Wi-Fi security", "None"),           "none" },
 	{ N_("WPA & WPA2 Personal"),               "wpa-personal" },
+	{ N_("WPA3 Personal"),                     "wpa3-personal" },
 	{ N_("WPA & WPA2 Enterprise"),             "wpa-enterprise" },
 	{ N_("WEP 40/128-bit Key (Hex or ASCII)"), "wep-key" },
 	{ N_("WEP 128-bit Passphrase"),            "wep-passphrase" },
@@ -275,6 +276,7 @@ nmt_page_wifi_constructed (GObject *object)
 	                        G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
 	nmt_editor_grid_append (NMT_EDITOR_GRID (subgrid), _("Password"), widget, NULL);
 	nmt_newt_stack_add (stack, "wpa-personal", subgrid);
+	nmt_newt_stack_add (stack, "wpa3-personal", subgrid);
 
 	/* "wpa-enterprise" */
 	// FIXME