diff --git a/modules/imap/site.js b/modules/imap/site.js
index 4fd966400a..aa8c583ee6 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -536,7 +536,9 @@ var prefetch_imap_folders = function() {
         function(res) { 
             $('#imap_prefetch_ids').val(ids.join(',')); 
             prefetch_imap_folders();
-            expand_imap_mailbox(res);
+            if ($('.email_folders ul.folders li').length == 1) {
+                expand_imap_mailbox(res);
+            }
         },
         [],
         true