diff --git a/drivers/completer/completer.go b/drivers/completer/completer.go
index 6ad73d8c24d..4294eb00fef 100644
--- a/drivers/completer/completer.go
+++ b/drivers/completer/completer.go
@@ -345,7 +345,7 @@ func (c completer) complete(previousWords []string, text []rune) [][]rune {
 
 	/* Complete CREATE */
 	if TailMatches(IGNORE_CASE, previousWords, "CREATE") {
-		return CompleteFromList(text, "DATABASE", "SEQUENCE", "TABLE", "VIEW", "TEMPORARY")
+		return CompleteFromList(text, "DATABASE", "SCHEMA", "SEQUENCE", "TABLE", "VIEW", "TEMPORARY")
 	}
 	if TailMatches(IGNORE_CASE, previousWords, "CREATE", "TEMP|TEMPORARY") {
 		return CompleteFromList(text, "TABLE", "VIEW")
diff --git a/drivers/completer/completer_test.go b/drivers/completer/completer_test.go
index f0b234ab84e..ced2dd55a40 100644
--- a/drivers/completer/completer_test.go
+++ b/drivers/completer/completer_test.go
@@ -226,6 +226,7 @@ func TestCompleter(t *testing.T) {
 			"CREATE ",
 			7,
 			[]string{
+				"SCHEMA",
 				"DATABASE",
 				"TABLE",
 				"SEQUENCE",