diff --git a/src/command/command.c b/src/command/command.c
index c8d34c0d..d7cf67e3 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1835,6 +1835,12 @@ _join_autocomplete(char *input, int *size)
     gboolean result = FALSE;
 
     input[*size] = '\0';
+
+    found = autocomplete_param_with_func(input, size, "/join", bookmark_find);
+    if (found != NULL) {
+        return found;
+    }
+
     gchar **args = parse_args(input, 2, 4, &result);
 
     if ((strncmp(input, "/join", 5) == 0) && (result == TRUE)) {