diff --git a/share/completions/j.fish b/share/completions/j.fish
new file mode 100644
index 000000000..04c45411d
--- /dev/null
+++ b/share/completions/j.fish
@@ -0,0 +1,6 @@
+function __history_completions
+	set -l tokens (commandline --current-process --tokenize)
+	history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* ""
+end
+
+complete -k -c j -a '(__history_completions)' -f