diff --git a/ChangeLog b/ChangeLog
index 5bf2245b0..a412218aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7-dev, 2012-01-28
+v0.3.7-dev, 2012-02-01
 
 
 Version 0.3.7 (under dev!)
 --------------------------
 
+* core: do not auto add space after nick completer if option
+  weechat.completion.nick_add_space is off
 * core: fix signal "buffer_switch": send it only once when switching buffer
   (bug #31158)
 * core: move option "scroll_unread" from command /input to /window
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index bd24afbec..159290be2 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -958,7 +958,7 @@ gui_completion_complete (struct t_gui_completion *completion)
                     free (completion->word_found);
                 completion->word_found = strdup (ptr_item->data);
                 completion->word_found_is_nick = item_is_nick;
-                if (item_is_nick && (completion->base_word_pos > 0)
+                if (item_is_nick
                     && !CONFIG_BOOLEAN(config_completion_nick_add_space))
                 {
                     completion->add_space = 0;