diff --git a/CHANGELOG b/CHANGELOG
index 4cb5bf823..b93c57050 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail
 
 - Managesieve: Replace "Filter disabled" with "Filter enabled" (#7028)
 - Managesieve: Fix so modifier type select wasn't hidden after hiding modifier select on header change
+- Managesieve: Fix filter selection after removing a first filter (#7079)
 - Enigma: Add script to import keys from filesystem to the db storage (for multihost)
 - Installer: Fix DB Write test on SQLite database ("database is locked" error) (#7064)
 - Installer: Fix so SQLite DSN with a relative path to the database file works in Installer
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 5e8657113..58a69fd8b 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,5 +1,6 @@
 - Replace "Filter disabled" with "Filter enabled" (#7028)
 - Fix so modifier type select wasn't hidden after hiding modifier select on header change
+- Fix filter selection after removing a first filter (#7079)
 
 * version 9.3 [2019-04-21]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index b8f71f6e8..c2fd7a536 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -273,7 +273,7 @@ rcube_webmail.prototype.managesieve_updatelist = function(action, o)
 
         // update row id
         if (rowid > id) {
-          this.uid = rowid - 1;
+          this.uid = String(rowid - 1);
           $(this).attr('id', 'rcmrow' + this.uid);
         }
       });