diff --git a/archinstall/main.py b/archinstall/main.py
index e0b045ac..43e3a22c 100644
--- a/archinstall/main.py
+++ b/archinstall/main.py
@@ -6,6 +6,7 @@ import sys
 import textwrap
 import time
 import traceback
+from pathlib import Path
 
 from archinstall.lib.args import arch_config_handler
 from archinstall.lib.disk.utils import disk_layouts
@@ -62,6 +63,16 @@ def _fetch_arch_db() -> bool:
 	return True
 
 
+def _list_scripts() -> str:
+	lines = ['The following are viable --script options:']
+
+	for file in (Path(__file__).parent / 'scripts').glob('*.py'):
+		if file.stem != '__init__':
+			lines.append(f'    {file.stem}')
+
+	return '\n'.join(lines)
+
+
 def run() -> int:
 	"""
 	This can either be run as the compiled and installed application: python setup.py install
@@ -72,6 +83,10 @@ def run() -> int:
 		arch_config_handler.print_help()
 		return 0
 
+	if arch_config_handler.get_script() == 'list':
+		print(_list_scripts())
+		return 0
+
 	if os.getuid() != 0:
 		print(tr('Archinstall requires root privileges to run. See --help for more.'))
 		return 1
diff --git a/archinstall/scripts/list.py b/archinstall/scripts/list.py
deleted file mode 100644
index 2b0c0881..00000000
--- a/archinstall/scripts/list.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import glob
-from pathlib import Path
-
-print('The following are viable --script options:')
-
-for script in [Path(x) for x in glob.glob(f'{Path(__file__).parent}/*.py')]:
-	if script.stem in ['__init__', 'list']:
-		continue
-
-	print(f'    {script.stem}')