diff --git a/qmk_cli/script_qmk.py b/qmk_cli/script_qmk.py
index a6c49ab..2aefd06 100644
--- a/qmk_cli/script_qmk.py
+++ b/qmk_cli/script_qmk.py
@@ -79,7 +79,7 @@ def main():
     # Import the subcommand modules
     import qmk_cli.subcommands
 
-    if qmk_firmware.exists():
+    if qmk_firmware.exists() and os.listdir(qmk_firmware):
         os.chdir(str(qmk_firmware))
         sys.path.append(str(qmk_firmware / 'lib' / 'python'))
         import qmk.cli
diff --git a/qmk_cli/subcommands/setup.py b/qmk_cli/subcommands/setup.py
index 12a8204..421a586 100644
--- a/qmk_cli/subcommands/setup.py
+++ b/qmk_cli/subcommands/setup.py
@@ -30,7 +30,7 @@ def setup(cli):
         exit(1)
 
     # Check on qmk_firmware, and if it doesn't exist offer to check it out.
-    if qmk_firmware.exists():
+    if qmk_firmware.exists() and os.listdir(qmk_firmware):
         cli.log.info('Found qmk_firmware at %s.', str(qmk_firmware))
     else:
         cli.log.error('qmk_firmware not found!')