diff --git a/Makefile b/Makefile
index 9cd7d7e55..c2d6f11be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 PYTHON ?= python3.8
 
+ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
 # Python Code Style
 reformat:
-	$(PYTHON) -m black `git ls-files "*.py"`
+	$(PYTHON) -m black $(ROOT_DIR)
 stylecheck:
-	$(PYTHON) -m black --check `git ls-files "*.py"`
+	$(PYTHON) -m black --check $(ROOT_DIR)
 stylediff:
-	$(PYTHON) -m black --check --diff `git ls-files "*.py"`
+	$(PYTHON) -m black --check --diff $(ROOT_DIR)
 
 # Translations
 gettext:
diff --git a/make.bat b/make.bat
index 428dd9bc0..dbc377855 100644
--- a/make.bat
+++ b/make.bat
@@ -5,24 +5,18 @@ if [%1] == [] goto help
 REM This allows us to expand variables at execution
 setlocal ENABLEDELAYEDEXPANSION
 
-REM This will set PYFILES as a list of tracked .py files
-set PYFILES=
-for /F "tokens=* USEBACKQ" %%A in (`git ls-files "*.py"`) do (
-    set PYFILES=!PYFILES! %%A
-)
-
 goto %1
 
 :reformat
-black !PYFILES!
+black "%~dp0."
 exit /B %ERRORLEVEL%
 
 :stylecheck
-black --check !PYFILES!
+black --check "%~dp0."
 exit /B %ERRORLEVEL%
 
 :stylediff
-black --check --diff !PYFILES!
+black --check --diff "%~dp0."
 exit /B %ERRORLEVEL%
 
 :newenv