diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index b754f4135..d4ad9e916 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -7563,6 +7563,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 	g_free (menu_ctx.valid_props_str);
 	g_weak_ref_clear (&weak);
 
+	quit ();
+
 	/* Save history file */
 	save_history_cmds (nm_connection_get_uuid (connection));