diff --git a/cheat b/cheat
index 845fc8e..397a306 100755
--- a/cheat
+++ b/cheat
@@ -108,12 +108,16 @@ def help(cheatsheets):
         Available keyphrases:
     ''').strip()
 
-    max_command = max([len(x) for x in cheatsheets.keys()]) + 3
-    print ('\n'.join(sorted(['%s [%s]' % (key.ljust(max_command), value)
-                            for key, value in cheatsheets.items()])))
+    print list_cheatsheets(cheatsheets)
     exit()
 
 
+def list_cheatsheets(cheatsheets):
+    max_command = max([len(x) for x in cheatsheets.keys()]) + 3
+    return ('\n'.join(sorted(['%s [%s]' % (key.ljust(max_command), value)
+                            for key, value in cheatsheets.items()])))
+
+
 def pretty_print(filename):
     "Applies syntax highlighting to a cheatsheet and writes it to stdout"
     try:
@@ -177,6 +181,11 @@ def main():
         print("\n".join(cheat_directories()))
         exit()
 
+    # list cheatsheets and exit
+    if option in ['-l', '--list']:
+        print list_cheatsheets(cheatsheets)
+        exit()
+
     # print the cheatsheet if it exists
     if keyphrase in cheatsheets:
         filename = os.path.join(cheatsheets[keyphrase], keyphrase)