diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index c3689eb8..7c572904 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -43,7 +43,8 @@ Supported options for **notmuch-emacs-mua** include
 
     ``--auto-daemon``
         Automatically start Emacs in daemon mode, if the Emacs server
-        is not running. Applicable with ``--client``.
+        is not running. Applicable with ``--client``. Implies
+        ``--create-frame``.
 
     ``--create-frame``
         Create a new frame instead of trying to use the current Emacs
diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index b51d8d0e..016fa126 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -108,6 +108,7 @@ while getopts :s:c:b:i:h opt; do
 	    ;;
 	--auto-daemon)
 	    AUTO_DAEMON="--alternate-editor="
+	    CREATE_FRAME="-c"
 	    ;;
 	--create-frame)
 	    CREATE_FRAME="-c"