diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 02316b163..5ea44ebd2 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -582,7 +582,14 @@ public class MessageList
         // platform.
         if (K9.manageBack())
         {
-            onShowFolderList();
+            if (mQueryString == null)
+            {
+                onShowFolderList();
+            }
+            else
+            {
+                onAccounts();
+            }
         }
         else
         {