diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 6dac490de..8e8bc3270 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -40,6 +40,7 @@ Bug fixes::
   * irc: add missing "account-tag" in list of supported capabilities
   * irc: fix display of self CTCP message containing bold attribute (issue #1981)
   * irc: fix memory leak in IRC message parser
+  * irc: fix switch to channel manually joined when server option autojoin_dynamic is on and option irc.look.buffer_switch_autojoin is off (issue #1982)
   * script: fix cursor position after `/script list -i` or `/script list -il`
   * script: fix buffer used by command `/script list -i|-il|-o|-ol`
 
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index f288d6ba2..58e847d4d 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -462,7 +462,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
                 if (noswitch
                     || (!manual_join && !autojoin_join)
                     || (manual_join && !weechat_config_boolean (irc_config_look_buffer_switch_join))
-                    || (autojoin_join && !weechat_config_boolean (irc_config_look_buffer_switch_autojoin)))
+                    || (!manual_join && autojoin_join && !weechat_config_boolean (irc_config_look_buffer_switch_autojoin)))
                 {
                     switch_to_channel = 0;
                 }