diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala
index ce7a45639..50bdde82d 100644
--- a/main/src/main/scala/sbt/internal/Act.scala
+++ b/main/src/main/scala/sbt/internal/Act.scala
@@ -304,7 +304,12 @@ object Act {
         case Some(ProjectRef(uri, _)) => index.keys(Some(BuildRef(uri)), conf, task)
         case _                        => Set()
       }
-    val keys: Set[String] = index.keys(proj, conf, task) ++ buildKeys
+    val globalKeys: Set[String] =
+      proj match {
+        case Some(_) => index.keys(None, conf, task)
+        case _       => Set()
+      }
+    val keys: Set[String] = index.keys(proj, conf, task) ++ buildKeys ++ globalKeys
     keyParser(keys)
   }
 
diff --git a/server-test/src/test/scala/testpkg/ClientTest.scala b/server-test/src/test/scala/testpkg/ClientTest.scala
index e03bd8a11..b4352062a 100644
--- a/server-test/src/test/scala/testpkg/ClientTest.scala
+++ b/server-test/src/test/scala/testpkg/ClientTest.scala
@@ -118,14 +118,16 @@ object ClientTest extends AbstractServerTest {
       "compileIncSetup",
       "compileIncremental",
       "compileJava",
+      "compileOrder",
       "compileOutputs",
       "compileProgress",
       "compileScalaBackend",
       "compileSplit",
+      "compilerCache",
       "compilers",
     )
 
-    assert(complete("compi") == expected)
+    assert(complete("compi").toVector == expected)
   }
   test("testOnly completions") { _ =>
     val testOnlyExpected = Vector(