diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index 8f6bfed97..0b56b7b1a 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -594,13 +594,10 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
                                                window->win_chat_width,
                                                window->win_chat_y,
                                                window->win_chat_x);
-        if (CONFIG_BOOLEAN(config_look_nicklist))
-            GUI_CURSES(window)->win_nick = newwin (window->win_nick_height,
-                                                   window->win_nick_width,
-                                                   window->win_nick_y,
-                                                   window->win_nick_x);
-        else
-            GUI_CURSES(window)->win_nick = NULL;
+        GUI_CURSES(window)->win_nick = newwin (window->win_nick_height,
+                                               window->win_nick_width,
+                                               window->win_nick_y,
+                                               window->win_nick_x);
     }
     else
     {
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index f7b6614e1..1102dca95 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -67,7 +67,8 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
     if (channel_type == IRC_CHANNEL_TYPE_CHANNEL)
     {
         weechat_buffer_set (new_buffer, "nick", server->nick);
-        weechat_buffer_set (new_buffer, "nicklist", "1");
+        if (weechat_config_integer (weechat_config_get ("weechat.look.nicklist")))
+            weechat_buffer_set (new_buffer, "nicklist", "1");
         weechat_buffer_set (new_buffer, "nicklist_display_groups", "0");
         weechat_nicklist_add_group (new_buffer, NULL, IRC_NICK_GROUP_OP,
                                     "nicklist_group", 1);