diff --git a/ChangeLog b/ChangeLog
index a124300d5..06598de96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8-dev, 2012-05-03
+v0.3.8-dev, 2012-05-04
 
 
 Version 0.3.8 (under dev!)
 --------------------------
 
+* core: fix crash in focus hook for nicklist (bug #36271)
 * core: fix truncated config files (zero-length) after system crash (bug #36383)
 * core: fix display bugs and crashs with small windows (bug #36107)
 * core: convert options weechat.look.prefix_align_more and
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index 04ba15cf6..6cd68b4a7 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -1509,7 +1509,7 @@ gui_bar_item_focus_buffer_nicklist (void *data,
         hashtable_set (info, "nick", ptr_nick->name);
         hashtable_set (info, "prefix", ptr_nick->prefix);
     }
-    else
+    else if (ptr_group)
     {
         hashtable_set (info,
                        "group",