diff --git a/program/js/app.js b/program/js/app.js
index 24d1f19e7..19116a55d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7170,9 +7170,9 @@ function rcube_webmail()
           this.enable_command('purge', this.purge_mailbox_test() && !is_multifolder);
           this.enable_command('import-messages', !is_multifolder);
           this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);
-          this.enable_command('set-listmode', this.env.threads && !is_multifolder);
 
           if ((response.action == 'list' || response.action == 'search') && this.message_list) {
+            this.enable_command('set-listmode', this.env.threads && !is_multifolder);
             this.msglist_select(this.message_list);
             this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
           }