diff --git a/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/GradleDslVersionCatalogHandler.kt b/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/GradleDslVersionCatalogHandler.kt
index 05d6f8ebf23a..94aa4a17d091 100644
--- a/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/GradleDslVersionCatalogHandler.kt
+++ b/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/GradleDslVersionCatalogHandler.kt
@@ -20,7 +20,7 @@ class GradleDslVersionCatalogHandler : GradleVersionCatalogHandler {
 
   @Deprecated("Doesn't work for included builds of a composite build", replaceWith = ReplaceWith("getVersionCatalogFiles(module)"))
   override fun getVersionCatalogFiles(project: Project): Map<String, VirtualFile> {
-    return ProjectBuildModel.get(project).context.versionCatalogFiles.associate { it.catalogName to it.file } ?: emptyMap()
+    return ProjectBuildModel.get(project).context.versionCatalogFiles.associate { it.catalogName to it.file }
   }
 
   override fun getVersionCatalogFiles(module: Module): Map<String, VirtualFile> {
@@ -33,20 +33,21 @@ class GradleDslVersionCatalogHandler : GradleVersionCatalogHandler {
     val scope = context.resolveScope
     val module = ModuleUtilCore.findModuleForPsiElement(context) ?: return null
     val buildModel = getBuildModel(module) ?: return null
-    val versionCatalogModel = buildModel.versionCatalogsModel
-    if (versionCatalogModel.getVersionCatalogModel(catalogName) == null) return null
-    return SyntheticVersionCatalogAccessor.create(project, scope, versionCatalogModel, catalogName)
+    val catalogs = buildModel.versionCatalogsModel
+    val catalogModel = catalogs.getVersionCatalogModel(catalogName) ?: return null
+    return SyntheticVersionCatalogAccessor.create(project, scope, catalogModel, catalogName)
   }
 
   override fun getAccessorsForAllCatalogs(context: PsiElement): Map<String, PsiClass> {
     val project = context.project
     val scope = context.resolveScope
     val module = ModuleUtilCore.findModuleForPsiElement(context) ?: return emptyMap()
-    val catalogsModel = getBuildModel(module)?.versionCatalogsModel ?: return emptyMap()
+    val catalogs = getBuildModel(module)?.versionCatalogsModel ?: return emptyMap()
     val result = mutableMapOf<String, PsiClass>()
-    catalogsModel.catalogNames().forEach { catalogName ->
-      val accessor = SyntheticVersionCatalogAccessor.create(project, scope, catalogsModel, catalogName)
-      accessor?.let { result.putIfAbsent(catalogName, accessor) }
+    for (catalogName in catalogs.catalogNames()) {
+      val catalogModel = catalogs.getVersionCatalogModel(catalogName) ?: continue
+      val accessor = SyntheticVersionCatalogAccessor.create(project, scope, catalogModel, catalogName) ?: continue
+      result.putIfAbsent(catalogName, accessor)
     }
     return result
   }
diff --git a/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/SyntheticVersionCatalogAccessor.kt b/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/SyntheticVersionCatalogAccessor.kt
index aa18dcbf8ad2..cfd68e63b531 100644
--- a/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/SyntheticVersionCatalogAccessor.kt
+++ b/plugins/gradle/intellij.gradle.analysis/src/org/jetbrains/plugins/gradle/service/resolve/static/SyntheticVersionCatalogAccessor.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.gradle.service.resolve.static
 
-import com.android.tools.idea.gradle.dsl.api.GradleVersionCatalogsModel
+import com.android.tools.idea.gradle.dsl.api.GradleVersionCatalogModel
 import com.android.tools.idea.gradle.dsl.api.ext.GradlePropertyModel
 import com.intellij.lang.java.JavaLanguage
 import com.intellij.lang.java.beans.PropertyKind
@@ -21,26 +21,26 @@ import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames
 class SyntheticVersionCatalogAccessor(
   project: Project,
   scope: GlobalSearchScope,
-  model: GradleVersionCatalogsModel,
-  className: String,
+  model: GradleVersionCatalogModel,
+  catalogName: String,
   delegate: PsiClass,
 ) : LightClass(delegate) {
 
   private val libraries: Array<PsiMethod> =
-    SyntheticAccessorBuilder(project, scope, className, Kind.LIBRARY)
-      .buildMethods(this, model.libraries(className)!!.properties.let(::assembleTree), "")
+    SyntheticAccessorBuilder(project, scope, Kind.LIBRARY)
+      .buildMethods(this, model.libraries().properties.let(::assembleTree), "")
       .toTypedArray()
 
-  private val plugins: PsiMethod = SyntheticAccessorBuilder(project, scope, className, Kind.PLUGIN)
-    .buildEnclosingMethod(this, model.plugins(className)!!.properties, "plugins")
+  private val plugins: PsiMethod = SyntheticAccessorBuilder(project, scope, Kind.PLUGIN)
+    .buildEnclosingMethod(this, model.plugins().properties, "plugins")
 
-  private val versions: PsiMethod = SyntheticAccessorBuilder(project, scope, className, Kind.VERSION)
-    .buildEnclosingMethod(this, model.versions(className)!!.properties, "versions")
+  private val versions: PsiMethod = SyntheticAccessorBuilder(project, scope, Kind.VERSION)
+    .buildEnclosingMethod(this, model.versions().properties, "versions")
 
-  private val bundles: PsiMethod = SyntheticAccessorBuilder(project, scope, className, Kind.BUNDLE)
-    .buildEnclosingMethod(this, model.bundles(className)!!.properties, "bundles")
+  private val bundles: PsiMethod = SyntheticAccessorBuilder(project, scope, Kind.BUNDLE)
+    .buildEnclosingMethod(this, model.bundles().properties, "bundles")
 
-  private val className = "LibrariesFor${StringUtil.capitalize(className)}"
+  private val className = "LibrariesFor${StringUtil.capitalize(catalogName)}"
 
   override fun getMethods(): Array<PsiMethod> {
     return libraries + arrayOf(plugins, versions, bundles)
@@ -57,7 +57,7 @@ class SyntheticVersionCatalogAccessor(
     fun create(
       project: Project,
       scope: GlobalSearchScope,
-      model: GradleVersionCatalogsModel,
+      model: GradleVersionCatalogModel,
       className: String,
     ): SyntheticVersionCatalogAccessor? {
       val delegate = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_OBJECT, scope) ?: return null
@@ -68,7 +68,7 @@ class SyntheticVersionCatalogAccessor(
       LIBRARY("Library"), PLUGIN("Plugin"), BUNDLE("Bundle"), VERSION("Version")
     }
 
-    private class SyntheticAccessorBuilder(val project: Project, val gradleScope: GlobalSearchScope, val className: String, val kind: Kind) {
+    private class SyntheticAccessorBuilder(val project: Project, val gradleScope: GlobalSearchScope, val kind: Kind) {
 
       private fun buildSyntheticInnerClass(mapping: List<Tree>,
                                            containingClass: PsiClass,
diff --git a/plugins/gradle/java/testSources/dsl/versionCatalogs/GradleVersionCatalogsCompletionTest.kt b/plugins/gradle/java/testSources/dsl/versionCatalogs/GradleVersionCatalogsCompletionTest.kt
index f130f4041916..3f920f07ae69 100644
--- a/plugins/gradle/java/testSources/dsl/versionCatalogs/GradleVersionCatalogsCompletionTest.kt
+++ b/plugins/gradle/java/testSources/dsl/versionCatalogs/GradleVersionCatalogsCompletionTest.kt
@@ -35,7 +35,7 @@ class GradleVersionCatalogsCompletionTest : GradleCodeInsightTestCase() {
     }
   }
 
-  //@ParameterizedTest
+  @ParameterizedTest
   @BaseGradleVersionSource
   fun testCompletionForBundles(gradleVersion: GradleVersion) {
     test(gradleVersion, BASE_VERSION_CATALOG_FIXTURE) {