diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 2cf7d1ab8..b93d168ab 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -923,7 +923,7 @@ def _raw_main(args, lib=None):
 
     # Bypass _setup so that an invalid configuration does not prevent
     # the editor from starting.
-    if subargs[0] == 'config' and '-e' in subargs:
+    if subargs[0] == 'config' and ('-e' in subargs or '--edit' in subargs):
         from beets.ui.commands import config_edit
         return config_edit()