diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js
index 6b8cd66ae2..e47c5dd59c 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.js
@@ -52,28 +52,31 @@ export async function getCompletions(query: string, selection: SelectionRange, f
      otherwise, we run into a condition where new completions are displayed
      while the user is interacting with the list, which makes it difficult
      to predict whether an action will actually do what is intended
-
-     It ends up containing a list of Q promise states, which are objects with
-     state (== "fulfilled" || "rejected") and value. */
-    const completionsList = await Q.allSettled(
-        PROVIDERS.map(provider => {
-            return Promise.resolve(provider.getCompletions(query, selection, force))
-                .timeout(PROVIDER_COMPLETION_TIMEOUT);
+    */
+    const completionsList = await Promise.all(
+        // Array of inspections of promises that might timeout. Instead of allowing a
+        // single timeout to reject the Promise.all, reflect each one and once they've all
+        // settled, filter for the fulfilled ones
+        PROVIDERS.map((provider) => {
+            return provider
+                .getCompletions(query, selection, force)
+                .timeout(PROVIDER_COMPLETION_TIMEOUT)
+                .reflect();
         }),
     );
 
-    return completionsList
-        .filter(completion => completion.state === "fulfilled")
-        .map((completionsState, i) => {
-            return {
-                completions: completionsState.value,
-                provider: PROVIDERS[i],
+    return completionsList.filter(
+        (inspection) => inspection.isFulfilled(),
+    ).map((completionsState, i) => {
+        return {
+            completions: completionsState.value(),
+            provider: PROVIDERS[i],
 
-                /* the currently matched "command" the completer tried to complete
-                 * we pass this through so that Autocomplete can figure out when to
-                 * re-show itself once hidden.
-                 */
-                command: PROVIDERS[i].getCurrentCommand(query, selection, force),
-            };
-        });
+            /* the currently matched "command" the completer tried to complete
+             * we pass this through so that Autocomplete can figure out when to
+             * re-show itself once hidden.
+             */
+            command: PROVIDERS[i].getCurrentCommand(query, selection, force),
+        };
+    });
 }