diff --git a/config/neomutt/accounts/account.rc b/config/neomutt/accounts/account.rc
index b618aa7..b3c8299 100644
--- a/config/neomutt/accounts/account.rc
+++ b/config/neomutt/accounts/account.rc
@@ -5,6 +5,6 @@ set postponed = "+$my_account/Draft"
 set trash = "+$my_account/Trash"
 
 macro index,pager gs "<shell-escape>mbsync $my_mbsync_conf $my_account<enter>" "IMAP sync account"
-macro index,pager gi "<shell-escape>mbsync $my_mbsync_conf $my_account:Inbox<enter>" "IMAP sync Inbox"
+macro index,pager gi "<shell-escape>mbsync $my_mbsync_conf $my_account:INBOX<enter>" "IMAP sync Inbox"
 
 # vim: syntax=neomuttrc
diff --git a/config/neomutt/keys.rc b/config/neomutt/keys.rc
index 1f4c5b7..ee3f13a 100644
--- a/config/neomutt/keys.rc
+++ b/config/neomutt/keys.rc
@@ -69,7 +69,8 @@ bind index,pager \Cf vfolder-from-query
 bind index,pager z entire-thread
 # Addresses autocompetion using notmuch
 # https://github.com/neomutt/neomutt/issues/629
-set query_command = "notmuch address from:%s"
+# https://github.com/neomutt/neomutt/issues/1333
+set query_command = "echo '' && notmuch address from:%s"
 bind editor <Tab> complete-query
 bind editor ^T complete
 set query_format="%4c %t %-70.70a %-70.70n %?e?(%e)?"