diff --git a/.eslintrc.js b/.eslintrc.js
index 6b9ace6d5..20c5dcbfe 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,6 +2,11 @@ module.exports = {
   root: true,
   settings: {
     'import/core-modules': ['electron'],
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx'],
+      },
+    },
     react: {
       version: 'detect',
     },
diff --git a/.lintstagedrc.js b/.lintstagedrc.js
index f42943d40..3ce2ca9d5 100644
--- a/.lintstagedrc.js
+++ b/.lintstagedrc.js
@@ -1,4 +1,10 @@
-const ignoredFiles = ['package.json', 'yarn.lock', 'tsconfig.json', '.lintstagedrc.js'];
+const ignoredFiles = [
+  'package.json',
+  'yarn.lock',
+  'tsconfig.json',
+  '.lintstagedrc.js',
+  '.eslintrc.js',
+];
 
 const path = require('path');
 
@@ -15,7 +21,7 @@ const buildLintCommand = filenames => {
     .map(f => path.relative(process.cwd(), f))
     .filter(f => !ignoredFiles.includes(f));
 
-  return results.length ? `eslint ${results.join(' ')}`: '';
+  return results.length ? `eslint ${results.join(' ')}` : '';
 };
 
 module.exports = {