diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java
index 98eb041ad40c..acb8420c8c78 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java
@@ -167,6 +167,15 @@ public class ExternalSystemNotificationManager {
     });
   }
 
+  public void openMessageView(@NotNull final ProjectSystemId externalSystemId, @NotNull final NotificationSource notificationSource) {
+    UIUtil.invokeLaterIfNeeded(new Runnable() {
+      @Override
+      public void run() {
+        prepareMessagesView(externalSystemId, notificationSource, true);
+      }
+    });
+  }
+
   public void clearNotifications(@NotNull final NotificationSource notificationSource,
                                  @NotNull final ProjectSystemId externalSystemId) {
     clearNotifications(null, notificationSource, externalSystemId);
@@ -256,7 +265,11 @@ public class ExternalSystemNotificationManager {
     UIUtil.invokeLaterIfNeeded(new Runnable() {
       @Override
       public void run() {
-        final NewErrorTreeViewPanel errorTreeView = prepareMessagesView(externalSystemId, notificationData);
+        boolean activate =
+          notificationData.getNotificationCategory() == NotificationCategory.ERROR ||
+          notificationData.getNotificationCategory() == NotificationCategory.WARNING;
+        final NewErrorTreeViewPanel errorTreeView =
+          prepareMessagesView(externalSystemId, notificationData.getNotificationSource(), activate);
         final GroupingElement groupingElement = errorTreeView.getErrorViewStructure().getGroupingElement(groupName, null, virtualFile);
         final NavigatableMessageElement navigatableMessageElement;
         if (notificationData.hasLinks()) {
@@ -293,9 +306,9 @@ public class ExternalSystemNotificationManager {
 
   @NotNull
   private NewErrorTreeViewPanel prepareMessagesView(@NotNull final ProjectSystemId externalSystemId,
-                                                    @NotNull final NotificationData notificationData) {
+                                                    @NotNull final NotificationSource notificationSource,
+                                                    boolean activateView) {
     final NewErrorTreeViewPanel errorTreeView;
-    final NotificationSource notificationSource = notificationData.getNotificationSource();
     final String contentDisplayName = getContentDisplayName(notificationSource, externalSystemId);
     final Pair<NotificationSource, ProjectSystemId> contentIdPair = Pair.create(notificationSource, externalSystemId);
     Content targetContent = findContent(contentIdPair, contentDisplayName);
@@ -316,7 +329,7 @@ public class ExternalSystemNotificationManager {
 
     messageView.getContentManager().setSelectedContent(targetContent);
     final ToolWindow tw = ToolWindowManager.getInstance(myProject).getToolWindow(ToolWindowId.MESSAGES_WINDOW);
-    if (tw != null && !tw.isActive()) {
+    if (activateView && tw != null && !tw.isActive()) {
       tw.activate(null, false);
     }
     return errorTreeView;
@@ -336,8 +349,8 @@ public class ExternalSystemNotificationManager {
   }
 
   @NotNull
-  private static String getContentDisplayName(@NotNull final NotificationSource notificationSource,
-                                              @NotNull final ProjectSystemId externalSystemId) {
+  public static String getContentDisplayName(@NotNull final NotificationSource notificationSource,
+                                             @NotNull final ProjectSystemId externalSystemId) {
     final String contentDisplayName;
     switch (notificationSource) {
       case PROJECT_SYNC:
diff --git a/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml b/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
index bb5e7e64a31d..af7db4c7eb95 100644
--- a/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
+++ b/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
@@ -16,7 +16,7 @@
                         serviceImplementation="com.intellij.openapi.externalSystem.service.project.ExternalLibraryPathTypeMapperImpl"/>
     <applicationService serviceImplementation="com.intellij.openapi.externalSystem.service.project.ProjectStructureHelper"/>
     <applicationService serviceImplementation="com.intellij.openapi.externalSystem.service.internal.ExternalSystemProcessingManager"/>
-    <projectService serviceImplementation="com.intellij.openapi.externalSystem.service.notification.ExternalSystemIdeNotificationManager"/>
+    <projectService serviceImplementation="com.intellij.openapi.externalSystem.service.notification.ExternalSystemNotificationManager"/>
 
     <!--Project structure management services-->
     <applicationService serviceImplementation="com.intellij.openapi.externalSystem.service.project.manage.ProjectDataManager"/>