diff --git a/usr/share/bash-completion/completions/onionjuggler-cli b/usr/share/bash-completion/completions/onionjuggler-cli
index ba5950e..69bfb0a 100644
--- a/usr/share/bash-completion/completions/onionjuggler-cli
+++ b/usr/share/bash-completion/completions/onionjuggler-cli
@@ -35,6 +35,7 @@ _onionjuggler_cli()
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
     fi
 
 } &&
diff --git a/usr/share/bash-completion/completions/onionjuggler-cli-auth-client b/usr/share/bash-completion/completions/onionjuggler-cli-auth-client
index 176dc89..3b39912 100644
--- a/usr/share/bash-completion/completions/onionjuggler-cli-auth-client
+++ b/usr/share/bash-completion/completions/onionjuggler-cli-auth-client
@@ -27,6 +27,7 @@ _onionjuggler_cli_auth_client()
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
     fi
 
 } &&
diff --git a/usr/share/bash-completion/completions/onionjuggler-cli-auth-server b/usr/share/bash-completion/completions/onionjuggler-cli-auth-server
index 6d38705..c548995 100644
--- a/usr/share/bash-completion/completions/onionjuggler-cli-auth-server
+++ b/usr/share/bash-completion/completions/onionjuggler-cli-auth-server
@@ -27,6 +27,7 @@ _onionjuggler_cli_auth_server()
     if [[ $cur == -* ]]; then
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
     fi
 
 } &&
diff --git a/usr/share/bash-completion/completions/onionjuggler-cli-web b/usr/share/bash-completion/completions/onionjuggler-cli-web
new file mode 100644
index 0000000..2ecc915
--- /dev/null
+++ b/usr/share/bash-completion/completions/onionjuggler-cli-web
@@ -0,0 +1,37 @@
+# onionjuggler-cli-web(8) completion               -*- shell-script -*-
+
+_onionjuggler_cli_web()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -no-check-service | \
+            --on | --off | --list | --getopt )
+            return
+        ;;
+        --port )
+            return
+        ;;
+        --service )
+            return
+        ;;
+        --folder )
+            _filedir
+            return
+        ;;
+        --help | --version | --getconf )
+            return
+        ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+} &&
+    complete -F _onionjuggler_cli_web onionjuggler-cli-web
+
+# ex: filetype=sh
diff --git a/usr/share/bash-completion/completions/onionjuggler-tui b/usr/share/bash-completion/completions/onionjuggler-tui
new file mode 100644
index 0000000..9d7a305
--- /dev/null
+++ b/usr/share/bash-completion/completions/onionjuggler-tui
@@ -0,0 +1,23 @@
+# onionjuggler-cli-auth-client(8) completion               -*- shell-script -*-
+
+_onionjuggler_cli_auth_client()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        --help | --version )
+            return
+        ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+} &&
+    complete -F _onionjuggler_cli_auth_client onionjuggler-cli-auth-client
+
+# ex: filetype=sh