diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
index 879c52598..ea63d5fd9 100644
--- a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
+++ b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
@@ -54,16 +54,6 @@ export class DataExtensionsEditorModule {
   public getCommands(): DataExtensionsEditorCommands {
     return {
       "codeQL.openDataExtensionsEditor": async () => {
-        if (
-          !(await this.cliServer.cliConstraints.supportsResolveExtensions())
-        ) {
-          void showAndLogErrorMessage(
-            this.app.logger,
-            "CodeQL CLI version v2.10.2 or later is required to use the data extensions editor.",
-          );
-          return;
-        }
-
         const db = this.databaseManager.currentDatabaseItem;
         if (!db) {
           void showAndLogErrorMessage(this.app.logger, "No database selected");
@@ -88,6 +78,16 @@ export class DataExtensionsEditorModule {
               return;
             }
 
+            if (
+              !(await this.cliServer.cliConstraints.supportsResolveExtensions())
+            ) {
+              void showAndLogErrorMessage(
+                this.app.logger,
+                `This feature requires CodeQL CLI version ${CliVersionConstraint.CLI_VERSION_WITH_RESOLVE_EXTENSIONS.format()} or later.`,
+              );
+              return;
+            }
+
             const modelFile = await pickExtensionPack(
               this.cliServer,
               db,