diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index bbe8b78b3..12c2294d1 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -7958,7 +7958,7 @@ do_connection_clone (NmCli *nmc, gboolean temporary, int argc, char **argv)
 	                    clone_connection_cb,
 	                    info);
 
-	nmc->should_wait = TRUE;
+	nmc->should_wait++;
 finish:
 	if (new_connection)
 		g_object_unref (new_connection);
@@ -8360,7 +8360,7 @@ do_connection_import (NmCli *nmc, gboolean temporary, int argc, char **argv)
 	                    add_connection_cb,
 	                    info);
 
-	nmc->should_wait = TRUE;
+	nmc->should_wait++;
 finish:
 	if (connection)
 		g_object_unref (connection);
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 953b007fc..dc8efc80b 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1984,7 +1984,7 @@ do_device_reapply (NmCli *nmc, int argc, char **argv)
 	}
 
 	nmc->nowait_flag = (nmc->timeout == 0);
-	nmc->should_wait = TRUE;
+	nmc->should_wait++;
 
 	info = g_slice_new0 (DeviceCbInfo);
 	info->nmc = nmc;
@@ -3325,7 +3325,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 
 	/* Activate the connection now */
 	nmc->nowait_flag = (nmc->timeout == 0);
-	nmc->should_wait = TRUE;
+	nmc->should_wait++;
 
 	info = g_malloc0 (sizeof (AddAndActivateInfo));
 	info->nmc = nmc;