diff --git a/client/main.c b/client/main.c
index 7f4bbd1..c63e849 100644
--- a/client/main.c
+++ b/client/main.c
@@ -829,6 +829,11 @@ static char **cmd_completion(const char *text, int start, int end)
 {
 	char **matches = NULL;
 
+	if (agent_completion() == TRUE) {
+		rl_attempted_completion_over = 1;
+		return NULL;
+	}
+
 	if (start > 0) {
 		int i;
 
@@ -860,6 +865,9 @@ static void rl_handler(char *input)
 	char *cmd, *arg;
 	int i;
 
+	if (agent_input(dbus_conn, input) == TRUE)
+		goto done;
+
 	if (!input) {
 		rl_insert_text("quit");
 		rl_redisplay();