diff --git a/CHANGELOG b/CHANGELOG
index de28a0dbd..d73bde019 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Prevent from folder selection on virtual folder collapsing (#1488346)
 - Upgraded to jQuery 1.7.1 (#1488337) and jQuery UI 1.8.18
 - Add Russian to the spellchecker languages list (#1488135)
 - Remember custom skin selection after logout (#1488355)
diff --git a/program/js/app.js b/program/js/app.js
index 79ba528a6..ca73db57c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1444,8 +1444,9 @@ function rcube_webmail()
       div.removeClass('expanded').addClass('collapsed');
       this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';
 
-      // select parent folder if one of its childs is currently selected
-      if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0)
+      // select the folder if one of its childs is currently selected
+      // don't select if it's virtual (#1488346)
+      if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !$(li).hasClass('virtual'))
         this.command('list', name);
     }
     else