diff --git a/tmuxp/cli.py b/tmuxp/cli.py
index e332c204b0..7de245e76a 100644
--- a/tmuxp/cli.py
+++ b/tmuxp/cli.py
@@ -9,6 +9,7 @@
 import os
 import platform
 import sys
+from subprocess import call
 
 import click
 import kaptan
@@ -1209,6 +1210,15 @@ def command_convert(confirmed, config):
         print('New config saved to <%s>.' % newfile)
 
 
+@cli.command(name='edit', short_help='Run $EDITOR on config.')
+@click.argument('config', type=ConfigPath(exists=True), nargs=1)
+def command_edit_config(config):
+    config = scan_config(config)
+
+    sys_editor = os.environ.get('EDITOR', 'vim')
+    call([sys_editor, config])
+
+
 @cli.command(
     name='ls', short_help='List configured sessions in {}.'.format(get_config_dir())
 )