diff --git a/CHANGELOG b/CHANGELOG
index 345bb6080..e94e311b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail
 - Templates: Add support for nested if conditions (#6818)
 - Templates: Make [space][slash] ending of condition objects optional (#6954)
 - Enigma: Fix so key list selection is reset when opening key creation form (#7154)
+- Enigma: Fix so using list checkbox selection does not load the the key preview frame
 - Password: Make chpass-wrapper.py Python 3 compatible (#7135)
 - Elastic: Fix bug where it was possible to switch editor mode when 'htmleditor' was in 'dont_override' (#7143)
 - Fix so messages in threads with no root aren't displayed separately (#4999)
diff --git a/plugins/enigma/enigma.js b/plugins/enigma/enigma.js
index b55756db7..78203fa63 100644
--- a/plugins/enigma/enigma.js
+++ b/plugins/enigma/enigma.js
@@ -347,7 +347,7 @@ rcube_webmail.prototype.enigma_keylist_select = function(list)
 {
     var id = list.get_single_selection(), url;
 
-    if (id)
+    if (id && !list.multi_selecting)
         url = '&_action=plugin.enigmakeys&_a=info&_id=' + id;
 
     this.enigma_loadframe(url);