diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index ce23fae644dd..40434becab7e 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -173,9 +173,7 @@ target('default': "Build artifacts") {
   buildDmg("pycharm", "${home}/python/build/DMG_background.png")
 }
 
-private layoutPlugins() {
-  def layouts = includeFile("$home/build/scripts/layouts.gant")
-
+private layoutPlugins(layouts) {
   dir("plugins") {
     layouts.layoutPlugin("django-db-config")
     layouts.layoutPlugin("python-javascript-debugger")
@@ -218,7 +216,7 @@ private String appInfoFile() {
 private layoutFull(Map args, String target, Set usedJars) {
   def openapiModules = pycharmPlatformApiModules()
   def implementationModules = [platformUltimateImplementationModules, pycharmImplementationModules()].flatten()
-
+  def superLayouts = includeFile("$home/build/scripts/layouts.gant")
   def result = layout(target) {
     dir("lib") {
       jar("util.jar") {
@@ -318,7 +316,7 @@ private layoutFull(Map args, String target, Set usedJars) {
       fileset(dir: "$home/community/license")
     }
 
-    layoutPlugins()
+    layoutPlugins(superLayouts)
 
     dir("bin") {
       fileset(dir: "$home/community/bin") {
@@ -328,7 +326,7 @@ private layoutFull(Map args, String target, Set usedJars) {
     }
   }
   patchPropertiesFile(target, args + [appendices: ["$home/build/conf/ideaJNC.properties"]])
-
+  superLayouts.packJetBrainsChromeExtension(target)
   return result
 }