diff --git a/aql2/src/prompt/ReadlinePromptCompletion.cpp b/aql2/src/prompt/ReadlinePromptCompletion.cpp
index 3d213c6dc222ee832dcce40d50d5539a2d2e5d62..ac54dcfa4db40c0d0a0c81c2bb3d713fa9769ee0 100644
--- a/aql2/src/prompt/ReadlinePromptCompletion.cpp
+++ b/aql2/src/prompt/ReadlinePromptCompletion.cpp
@@ -95,7 +95,7 @@ ReadlinePromptCompletion::CompletionContext ReadlinePromptCompletion::context (
 	if ( p >= rl_line_buffer && ( *p == '|' || *p == '(' ) )
 		return CompletionContext::ALGORITHM;
 
-	if ( masterCommandCompletionTest ( line, start, "execute" ) )
+	if ( masterCommandCompletionTest ( line, start, "execute" ) || masterCommandCompletionTest ( line, start, "print" ) )
 		return CompletionContext::ALGORITHM;
 
 	/* undecided, fallback to filepath */
diff --git a/aql2/src/prompt/ReadlinePromptCompletion.h b/aql2/src/prompt/ReadlinePromptCompletion.h
index afb26f7ee3fa1e75f859b9efe7b8ef1642b4b989..778ea683a7246a5ba5e587ff136a7c1f523c214a 100644
--- a/aql2/src/prompt/ReadlinePromptCompletion.h
+++ b/aql2/src/prompt/ReadlinePromptCompletion.h
@@ -64,7 +64,7 @@ class ReadlinePromptCompletion {
 	}
 
 	static std::set < std::string > fetchCommands ( const char *text ) {
-		return filter_completions ( { "execute", "introspect", "quit", "help", "set" }, text );
+		return filter_completions ( { "print", "execute", "introspect", "quit", "help", "set" }, text );
 	}
 
 	static std::set < std::string > fetchCommandsIntrospect ( const char *text ) {