diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index aee3ecc013..5b0a5a8fe4 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -156,10 +156,14 @@ public class EntityOperation {
                 boolean set = jargs.getBoolean(1);
 
                 List<String> keywords = new ArrayList<>(Arrays.asList(message.keywords));
+                if (set == keywords.contains(keyword))
+                    return;
+
                 while (keywords.remove(keyword))
                     ;
                 if (set)
                     keywords.add(keyword);
+
                 Collections.sort(keywords);
 
                 message.keywords = keywords.toArray(new String[0]);