diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
index 6f1b18034e..5588349cc8 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
@@ -71,6 +71,7 @@ import static java.util.stream.Collectors.toList;
  *
  * TODO don't mix nio and io
  */
+@SuppressWarnings("squid:S3725") // performance is not critical, for this type of checks
 public final class PluginProcessor
 {
 
@@ -202,7 +203,7 @@ public final class PluginProcessor
   }
 
   private Predicate<Path> isPluginDirectory() {
-    return dir -> new File(dir.resolve("META-INF/scm/plugin.xml").toString()).exists();
+    return dir -> Files.exists(dir.resolve(DIRECTORY_METAINF).resolve("scm").resolve("plugin.xml"));
   }
 
   /**
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
index 87e9cbf7b7..e9eaea3afa 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
@@ -134,6 +134,16 @@ public class PluginProcessorTest
     assertThat(plugin.getId(), is(PLUGIN_A.id));
   }
 
+  @Test
+  public void shouldCollectPluginsAndDoNotFailOnNonPluginDirectories() throws IOException {
+    new File(pluginDirectory, "some-directory").mkdirs();
+
+    copySmp(PLUGIN_A);
+    PluginWrapper plugin = collectAndGetFirst();
+
+    assertThat(plugin.getId(), is(PLUGIN_A.id));
+  }
+
   /**
    * Method description
    *