diff --git a/Classes/IRC/IRCWorld.m b/Classes/IRC/IRCWorld.m
index a7ed6991..7fb84fa4 100644
--- a/Classes/IRC/IRCWorld.m
+++ b/Classes/IRC/IRCWorld.m
@@ -193,8 +193,10 @@ - (void)markAllAsRead
 {
     for (IRCClient* u in _clients) {
         u.isUnread = NO;
+        u.isKeyword = NO;
         for (IRCChannel* c in u.channels) {
             c.isUnread = NO;
+            c.isKeyword = NO;
         }
     }
     [self reloadTree];