diff --git a/src/common/completion.c b/src/common/completion.c
index 03546ae45..27bc9b5a5 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -392,6 +392,11 @@ completion_build_list (t_completion *completion, void *channel)
             completion_stop (completion);
         return;
     }
+    if (strcasecmp (completion->base_command, "me") == 0)
+    {
+        completion->context = COMPLETION_NICK;
+        return;
+    }
     if (strcasecmp (completion->base_command, "notice") == 0)
     {
         if (completion->base_command_arg != 1)
diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c
index 03546ae45..27bc9b5a5 100644
--- a/weechat/src/common/completion.c
+++ b/weechat/src/common/completion.c
@@ -392,6 +392,11 @@ completion_build_list (t_completion *completion, void *channel)
             completion_stop (completion);
         return;
     }
+    if (strcasecmp (completion->base_command, "me") == 0)
+    {
+        completion->context = COMPLETION_NICK;
+        return;
+    }
     if (strcasecmp (completion->base_command, "notice") == 0)
     {
         if (completion->base_command_arg != 1)