diff --git a/code/templates/flip b/code/templates/flip
index a127e8d..80c179e 100755
--- a/code/templates/flip
+++ b/code/templates/flip
@@ -247,11 +247,11 @@ _get_completer() {
 local curr_arg
 curr_arg=${COMP_WORDS[COMP_CWORD]}
 if [[ $COMP_CWORD -eq 1 ]]; then
-  COMPREPLY=( $(compgen -W "help autocomplete list copy paste read write delete url update upload self" -- $curr_arg ) );
+  COMPREPLY=( $(compgen -W "help autocomplete list copy paste read write delete url short short-del update upload self" -- $curr_arg ) );
 fi
 if [[ $COMP_CWORD -eq 2 ]]; then
   case ${COMP_WORDS[$(( $COMP_CWORD - 1 ))]} in
-    r*|url|d*)
+    r*|url|d*|short*)
       local remotelist=$( eval FLIP_EXEC simplelist )
       COMPREPLY=( $(compgen -W "$remotelist" -- $curr_arg ) );
     ;;