diff --git a/config/initializers/canaid.rb b/config/initializers/canaid.rb
index d7a2a6614..716dd6989 100644
--- a/config/initializers/canaid.rb
+++ b/config/initializers/canaid.rb
@@ -1,4 +1,19 @@
 Canaid.configure do |config|
+  include AddonsHelper
+
   config.permissions_paths << 'app/permissions/**/*.rb'
-  config.permissions_paths << 'addons/**/app/permissions/**/*.rb'
+
+  # Include the included addons' permissions folders
+  rx = %r{^.*(addons/.*/app/permissions)$}
+  list_all_addons.each do |addon|
+    full_path = addon::Engine
+                .instance
+                .config
+                .eager_load_paths
+                .select { |p| p.ends_with?('permissions') }
+                .first
+    continue unless full_path
+    res = rx.match(full_path)
+    config.permissions_paths << "#{res[1]}/**/*.rb" if res && res.length > 1
+  end
 end
\ No newline at end of file