diff --git a/clean_files.txt b/clean_files.txt
index 54cf3152..1e9a7bb1 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -64,6 +64,7 @@ completion/available/conda.completion.bash
 completion/available/consul.completion.bash
 completion/available/docker.completion.bash
 completion/available/gcloud.completion.bash
+completion/available/gem.completion.bash
 completion/available/github-cli.completion.bash
 completion/available/helm.completion.bash
 completion/available/knife.completion.bash
diff --git a/completion/available/gem.completion.bash b/completion/available/gem.completion.bash
index 2d098529..8ce359f7 100644
--- a/completion/available/gem.completion.bash
+++ b/completion/available/gem.completion.bash
@@ -1,41 +1,32 @@
-#!/usr/bin/env bash
-# Completion for gem
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "gem completion"
 
-_installcomp() {
-  if [ -z "$REMOTE_GEMS" ]
-  then
-    REMOTE_GEMS=( $(gem list --remote --no-versions | tr '\n' ' ') )
-  fi
+__gem_completion() {
+	local cur=${COMP_WORDS[COMP_CWORD]}
+	local prev=${COMP_WORDS[COMP_CWORD - 1]}
+	case $prev in
+		install)
+			# list the remote gems and add to completion
+			if [ -z "$REMOTE_GEMS" ]; then
+				REMOTE_GEMS=($(gem list --remote --no-versions | sed 's/\*\*\* REMOTE GEMS \*\*\*//' | tr '\n' ' '))
+			fi
 
-  local cur=${COMP_WORDS[COMP_CWORD]}
-  COMPREPLY=( $(compgen -W "${REMOTE_GEMS[*]}" -- $cur) )
+			local cur=${COMP_WORDS[COMP_CWORD]}
+			COMPREPLY=($(compgen -W "${REMOTE_GEMS[*]}" -- "$cur"))
+			;;
+		uninstall)
+			# list all local installed gems and add to completion
+			if [ -z "$LOCAL_GEMS" ]; then
+				LOCAL_GEMS=($(gem list --no-versions | sed 's/\*\*\* LOCAL GEMS \*\*\*//' | tr '\n' ' '))
+			fi
+
+			local cur=${COMP_WORDS[COMP_CWORD]}
+			COMPREPLY=($(compgen -W "${LOCAL_GEMS[*]}" -- "$cur"))
+			;;
+	esac
+	local commands=(build cert check cleanup contents dependency environment fetch generate_index help install list lock outdated owner pristine push query rdoc search server sources specification stale uninstall unpack update which)
+	COMPREPLY=($(compgen -W "${commands[*]}" -- "$cur"))
 }
 
-_uninstallcomp() {
-  if [ -z "$LOCAL_GEMS" ]
-  then
-    LOCAL_GEMS=( $(gem list --no-versions | sed 's/\*\*\* LOCAL GEMS \*\*\*//' | tr '\n' ' ') )
-  fi
-
-  local cur=${COMP_WORDS[COMP_CWORD]}
-  COMPREPLY=( $(compgen -W "${LOCAL_GEMS[*]}" -- $cur) )
-}
-
-_gem() {
-  local cur=${COMP_WORDS[COMP_CWORD]}
-  local prev=${COMP_WORDS[COMP_CWORD-1]}
-  case $prev in
-    install)
-      _installcomp
-      return 0
-      ;;
-    uninstall)
-      _uninstallcomp
-      return 0
-      ;;
-  esac
-  local commands=(build cert check cleanup contents dependency environment fetch generate_index help install list lock outdated owner pristine push query rdoc search server sources specification stale uninstall unpack update which)
-  COMPREPLY=( $(compgen -W "${commands[*]}" -- $cur) )
-}
-
-complete -F _gem gem
+complete -F __gem_completion gem