diff --git a/CHANGELOG b/CHANGELOG
index 6ad97373f..b62dccc8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail
 - Fix so type attribute on script tags is not used on HTML5 pages (#6975)
 - Fix unread count after purge on a folder that is not currently selected (#7051)
 - Fix bug where Enter key didn't work on messages list in "List" layout (#7052)
+- Fix bug where deleting a saved search in addressbook caused display issue on sources/groups list (#7061)
 
 RELEASE 1.4.1
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index c7d782fa8..0a8e12afa 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7143,9 +7143,8 @@ function rcube_webmail()
   // callback from server upon search-delete command
   this.remove_search_item = function(id)
   {
-    var li, key = 'S'+id;
-    if (this.savedsearchlist.remove(key)) {
-      this.triggerEvent('search_delete', { id:id, li:li });
+    if (this.savedsearchlist.remove('S' + id)) {
+      this.triggerEvent('search_delete', {id: id});
     }
 
     this.env.search_id = null;
diff --git a/program/js/treelist.js b/program/js/treelist.js
index c120e4a29..21b22803c 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -519,7 +519,7 @@ function rcube_treelist_widget(node, p)
 
       // remove tree-toggle button and children list
       if (!parent.children().length) {
-        parent.parent().find('div.treetoggle').remove();
+        parent.parent('li').find('div.treetoggle').remove();
         parent.remove();
       }