diff --git a/ChangeLog b/ChangeLog
index ca982bff1..a19ccd1f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2006-10-20
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug on ignore with "mode" IRC command (bug #18058)
    * fixed crash when loading ruby script if file does not exist, with
      Ruby >= 1.9 only (bug #18064)
    * added date in plugin function get_buffer_data()
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index ade984343..64ced3234 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -707,6 +707,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
         ptr_channel = channel_search (server, arguments);
         if (ptr_channel)
         {
+            command_ignored |= ignore_check (host, "mode",
+                                             ptr_channel->name, server->name);
             if (!command_ignored)
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index ca982bff1..a19ccd1f7 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2006-10-20
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug on ignore with "mode" IRC command (bug #18058)
    * fixed crash when loading ruby script if file does not exist, with
      Ruby >= 1.9 only (bug #18064)
    * added date in plugin function get_buffer_data()
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index ade984343..64ced3234 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -707,6 +707,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
         ptr_channel = channel_search (server, arguments);
         if (ptr_channel)
         {
+            command_ignored |= ignore_check (host, "mode",
+                                             ptr_channel->name, server->name);
             if (!command_ignored)
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);