diff --git a/config/neomutt/accounts/account.rc b/config/neomutt/accounts/account.rc
index b3c8299..d395eb8 100644
--- a/config/neomutt/accounts/account.rc
+++ b/config/neomutt/accounts/account.rc
@@ -6,5 +6,6 @@ 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 gf "<shell-escape>fdm fetch -a $my_account<enter>" "fdm filter mailbox"
 
 # vim: syntax=neomuttrc
diff --git a/config/neomutt/neomuttrc b/config/neomutt/neomuttrc
index 738d0e9..faca025 100644
--- a/config/neomutt/neomuttrc
+++ b/config/neomutt/neomuttrc
@@ -4,10 +4,3 @@ set folder = "~/mail"
 set my_msmtp_conf = ""              # Leave empty for default
 set my_mbsync_conf = ""             # Leave empty for default
 source common.rc
-
-# Override sidebar_new_mail_only
-# Move back to sidebar.rc once the issue is resolved
-# https://github.com/neomutt/neomutt/issues/2208
-sidebar_whitelist `find $folder -mindepth 1 -maxdepth 1 -type d ! -name cur ! -name tmp ! -name new ! -name .notmuch -printf '"%f"\0' | xargs -0`
-sidebar_whitelist `find $folder -mindepth 1 -maxdepth 1 -type d ! -name cur ! -name tmp ! -name new ! -name .notmuch -printf '"%p"\0' | xargs -0`
-sidebar_whitelist `find ~/mail -mindepth 1 -type d -iname inbox -printf '"%p"\0' | xargs -0`
diff --git a/config/neomutt/sidebar.rc b/config/neomutt/sidebar.rc
index 5fca677..22fea79 100644
--- a/config/neomutt/sidebar.rc
+++ b/config/neomutt/sidebar.rc
@@ -13,4 +13,9 @@ unset sidebar_next_new_wrap         # wrap <sidebar-{next,prev}-new> to beginnin
 unset sidebar_on_right              # keep bar on the left
 set sidebar_sort_method = 'path'    # sort by mailbox path alphabetically
 
+# Override sidebar_new_mail_only
+sidebar_whitelist `find $folder -mindepth 1 -maxdepth 1 -type d ! -name cur ! -name tmp ! -name new ! -name .notmuch -printf '"%f"\0' | xargs -0`
+sidebar_whitelist `find $folder -mindepth 1 -maxdepth 1 -type d ! -name cur ! -name tmp ! -name new ! -name .notmuch -printf '"%p"\0' | xargs -0`
+sidebar_whitelist `find $folder -mindepth 1 -type d -iname inbox -printf '"%p"\0' | xargs -0`
+
 # vim: syntax=neomuttrc