diff --git a/zsh/completions/_just b/zsh/completions/_just
new file mode 100644
index 0000000..89ad8be
--- /dev/null
+++ b/zsh/completions/_just
@@ -0,0 +1,11 @@
+#compdef just
+
+function _just() {
+    local -a cmdlist
+    for entry in $(just --summary); do
+        cmdlist+="${entry}"
+    done
+    _describe 'Just options' cmdlist
+}
+
+_just "$@"
diff --git a/zsh/zshrc b/zsh/zshrc
index 02b9287..dd4ab2a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,5 +1,4 @@
 # Lines configured by zsh-newuser-install
-# zmodload zsh/zprof
 
 HISTFILE=~/.histfile
 HISTSIZE=10000
@@ -73,11 +72,6 @@ compctl -K _send_to_pane send-to-pane
 # the following lines sourced from the fzf distribution files
 export FZF_TMUX=1
 
-function _just() {
-    reply=($(just --summary))
-}
-compctl -K _just just menu-complete
-
 export PATH="$PATH:$HOME/.anyenv/bin"
 eval "$(anyenv init -)"
 export PATH="$(yarn global bin):$PATH"
@@ -92,5 +86,3 @@ else
 	printf "No zshsrc\nOne has been created\n"
 	touch $HOME/.zshsrc
 fi
-
-# zprof