diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitSettingsEditor.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitSettingsEditor.java
index 8bcb115d4e68..6dba890aa432 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitSettingsEditor.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitSettingsEditor.java
@@ -64,7 +64,7 @@ public class JUnitSettingsEditor extends JavaSettingsEditorBase<JUnitConfigurati
     scopeFragment.addSettingsEditorListener(editor -> {
 
       boolean disableModuleClasspath = testKind.disableModuleClasspath(scopeFragment.getSelectedVariant() == TestSearchScope.WHOLE_PROJECT);
-      moduleClasspath.setSelected(!disableModuleClasspath);
+      moduleClasspath.setSelected(!disableModuleClasspath && moduleClasspath.isInitiallyVisible(mySettings));
       if (disableModuleClasspath) {
         moduleClasspath.component().setSelectedModule(null);
       }