diff --git a/plugins/bashmarks/bashmarks.plugin.sh b/plugins/bashmarks/bashmarks.plugin.sh
index 1c676e0ec..2a47bce32 100644
--- a/plugins/bashmarks/bashmarks.plugin.sh
+++ b/plugins/bashmarks/bashmarks.plugin.sh
@@ -196,10 +196,13 @@ function _bashmarks_is_valid_bookmark_name {
 # completion command
 function _bashmarks_comp_cmd_bm {
   COMPREPLY=()
-  if ((COMP_CWORD >= 2)) && [[ ${COMP_WORDS[1]} == -[gpd] ]]; then
+
+  # bm, g, p, d, bm -[gpd]
+  if ((COMP_CWORD == 1)) || { ((COMP_CWORD >= 2)) && [[ ${COMP_WORDS[1]} == -[gpd] ]]; }; then
     local cur=${COMP_WORDS[COMP_CWORD]}
     COMPREPLY=($(compgen -W '$(_bashmarks_list_names)' -- "$cur"))
   fi
+
   return 0
 }
 
@@ -236,8 +239,6 @@ if [[ ${ZSH_VERSION-} ]]; then
 else
   shopt -s progcomp
   complete -F _bashmarks_comp_cmd_bm bm
-  complete -F _bashmarks_comp_cmd_bm bm
-  complete -F _bashmarks_comp_cmd_bm bm
   complete -F _bashmarks_comp_cmd_bm g
   complete -F _bashmarks_comp_cmd_bm p
   complete -F _bashmarks_comp_cmd_bm d