diff --git a/src/plugins/alias/alias-command.c b/src/plugins/alias/alias-command.c
index a1f052d5c..6180a29da 100644
--- a/src/plugins/alias/alias-command.c
+++ b/src/plugins/alias/alias-command.c
@@ -25,8 +25,10 @@
 
 #include "../weechat-plugin.h"
 #include "alias.h"
+#include "alias-command.h"
 #include "alias-config.h"
 
+
 /*
  * Adds a new alias.
  */
@@ -350,7 +352,9 @@ alias_command_cb (const void *pointer, void *data,
 void
 alias_command_init ()
 {
-    weechat_hook_command (
+    struct t_hook *ptr_hook;
+
+    ptr_hook = weechat_hook_command (
         "alias",
         N_("list, add or remove command aliases"),
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated */
@@ -406,4 +410,5 @@ alias_command_init ()
         " || rename %(alias) %(alias)"
         " || missing",
         &alias_command_cb, NULL, NULL);
+    ALIAS_COMMAND_KEEP_SPACES;
 }
diff --git a/src/plugins/alias/alias-command.h b/src/plugins/alias/alias-command.h
index ac2565af7..994cb7988 100644
--- a/src/plugins/alias/alias-command.h
+++ b/src/plugins/alias/alias-command.h
@@ -20,6 +20,8 @@
 #ifndef WEECHAT_PLUGIN_ALIAS_COMMAND_H
 #define WEECHAT_PLUGIN_ALIAS_COMMAND_H
 
+#define ALIAS_COMMAND_KEEP_SPACES weechat_hook_set (ptr_hook, "keep_spaces_right", "1")
+
 extern void alias_command_init ();
 
 #endif /* WEECHAT_PLUGIN_ALIAS_COMMAND_H */