diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIdeaWizardStepsProvider.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIdeaWizardStepsProvider.java
index 17b7577a88f9..a54b161a10bc 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIdeaWizardStepsProvider.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIdeaWizardStepsProvider.java
@@ -28,7 +28,7 @@ public class CustomizeIdeaWizardStepsProvider implements CustomizeIDEWizardSteps
           featuredPlugins.put("Node JS", "Web Development:Support for Node.js projects:NodeJS");
         }
         featuredPlugins.put("Grazie", "Spellcheck:Intelligent spelling and grammar checks:tanvd.grazi");
-        featuredPlugins.put("AWS Toolkit", "Cloud Support:Helps you create, test, and debug serverless applications built using the AWS Serverless Application Model:aws.toolkit");
+        addAwsPlugin(featuredPlugins);
         featuredPlugins.put("IntelliJ Light Theme", "Themes:IntelliJ Light is a new light theme for IntelliJ-based IDEs:com.jetbrains.lightThemePreview");
         featuredPlugins.put("Big Data Tools", "Tools Integration:Zeppelin and Spark support:com.intellij.bigdatatools");
         featuredPlugins.put("EduTools", "Code tools:Learn and teach programming languages such as Kotlin, Java, and Python in the form of coding tasks and custom verification tests:com.jetbrains.edu");
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
index 881db439298d..832129b935ff 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java
@@ -259,6 +259,10 @@ public class PluginGroups {
     featuredPlugins.put("IdeaVim", "Editor:Emulates Vim editor:" + IDEA_VIM_PLUGIN_ID);
   }
 
+  public static void addAwsPlugin(Map<String, String> featuredPlugins) {
+    featuredPlugins.put("AWS Toolkit", "Cloud Support:Provides integration with AWS resources including creating, testing and debugging modern cloud applications.:aws.toolkit");
+  }
+
   public static void addTrainingPlugin(Map<String, String> featuredPlugins) {
     featuredPlugins.put("IDE Features Trainer", "Code tools:Learn basic shortcuts and essential IDE features with quick interactive exercises:training");
   }
diff --git a/python/ideCoreSrc/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java b/python/ideCoreSrc/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java
index e2f26a87bdbd..f6ce01cfb50b 100644
--- a/python/ideCoreSrc/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java
+++ b/python/ideCoreSrc/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java
@@ -19,7 +19,7 @@ public class PyCharmCustomizeIDEWizardStepsProvider implements CustomizeIDEWizar
       protected void initGroups(Map<String, Pair<Icon, List<String>>> tree, Map<String, String> featuredPlugins) {
         addVimPlugin(featuredPlugins);
         addRPlugin(featuredPlugins);
-        featuredPlugins.put("AWS Toolkit", "Tools Integration:A plugin for interacting with Amazon Web Services:aws.toolkit");
+        addAwsPlugin(featuredPlugins);
       }
     };