diff --git a/src/main/getDi.ts b/src/main/getDi.ts
index ac7dffe12b..6b5de4e07b 100644
--- a/src/main/getDi.ts
+++ b/src/main/getDi.ts
@@ -18,6 +18,7 @@ export const getDi = () => {
       require.context("./", true, /\.injectable\.(ts|tsx)$/),
       require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
       require.context("../common", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../behaviours", true, /.*\/(main|common)\/.*\.injectable\.(ts|tsx)$/),
     ],
   });
 
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index 36713d852d..5d22057c06 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -204,6 +204,9 @@ const getInjectableFilePaths = memoize(() => [
   ...glob.sync("./**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../extensions/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../common/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
+  ...glob.sync("../behaviours/**/{main,common}/*.injectable.{ts,tsx}", {
+    cwd: __dirname,
+  }),
 ]);
 
 // TODO: Reorganize code in Runnables to get rid of requirement for override
diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx
index 3380d25c06..7fdc6dae8a 100644
--- a/src/renderer/getDi.tsx
+++ b/src/renderer/getDi.tsx
@@ -19,6 +19,7 @@ export const getDi = () => {
       require.context("./", true, /\.injectable\.(ts|tsx)$/),
       require.context("../common", true, /\.injectable\.(ts|tsx)$/),
       require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../behaviours", true, /.*\/(renderer|common)\/.*\.injectable\.(ts|tsx)$/),
     ],
   });
 
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 2f030c8ab9..67cc83f53a 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -158,6 +158,9 @@ const getInjectableFilePaths = memoize(() => [
   ...glob.sync("./**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../common/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../extensions/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
+  ...glob.sync("../behaviours/**/{renderer,common}/*.injectable.{ts,tsx}", {
+    cwd: __dirname,
+  }),
 ]);
 
 const overrideFunctionalInjectables = (di: DiContainer, injectables: Injectable<any, any, any>[]) => {