diff --git a/src/com/android/email/activity/FolderList.java b/src/com/android/email/activity/FolderList.java
index 1880c67cf..35177cf95 100644
--- a/src/com/android/email/activity/FolderList.java
+++ b/src/com/android/email/activity/FolderList.java
@@ -395,6 +395,7 @@ public class FolderList extends K9ListActivity {
         }
         else {
             mInitialFolder = null;
+            mStartup = false;
         }
 
         Log.v(Email.LOG_TAG, "mInitialFolder: " + mInitialFolder);
@@ -537,7 +538,9 @@ public class FolderList extends K9ListActivity {
         // we won't have a parent activity and we'll need to get back to it
         if (mStartup
             || isTaskRoot()) {
-            startActivity(new Intent(this, Accounts.class));
+            Intent intent = new Intent(this, Accounts.class);
+            intent.putExtra(Accounts.EXTRA_STARTUP, false);
+            startActivity(intent);
         }
         finish();
     }