diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleDownloadSourcesAction.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleDownloadSourcesAction.kt
index 88ecb8efdfde..e7b818e197e9 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleDownloadSourcesAction.kt
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleDownloadSourcesAction.kt
@@ -32,4 +32,6 @@ class GradleDownloadSourcesAction : ExternalSystemAction() {
       }
     }
   }
+
+  override fun isVisible(e: AnActionEvent) = getSystemId(e) == GradleConstants.SYSTEM_ID
 }
\ No newline at end of file
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyAnalyzerAction.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyAnalyzerAction.kt
index b540bb970742..31bedf52c051 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyAnalyzerAction.kt
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyAnalyzerAction.kt
@@ -63,7 +63,9 @@ class ToolbarDependencyAnalyzerAction : DependencyAnalyzerAction() {
 
   override fun getSystemId(e: AnActionEvent) = GradleConstants.SYSTEM_ID
 
-  override fun isEnabledAndVisible(e: AnActionEvent) = true
+  override fun isEnabledAndVisible(e: AnActionEvent): Boolean {
+    return e.getData(ExternalSystemDataKeys.EXTERNAL_SYSTEM_ID) == GradleConstants.SYSTEM_ID
+  }
 
   override fun setSelectedState(view: DependencyAnalyzerView, e: AnActionEvent) {
     viewAction.setSelectedState(view, e)