diff --git a/clean_files.txt b/clean_files.txt
index b49952d1..ddafc469 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/github-cli.completion.bash
 completion/available/helm.completion.bash
 completion/available/knife.completion.bash
 completion/available/packer.completion.bash
diff --git a/completion/available/github-cli.completion.bash b/completion/available/github-cli.completion.bash
index b392a865..4a611394 100644
--- a/completion/available/github-cli.completion.bash
+++ b/completion/available/github-cli.completion.bash
@@ -1,8 +1,9 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 cite "about-completion"
 about-completion "GitHub CLI completion"
 
 if _binary_exists gh; then
-    complete -p gh &> /dev/null || return
-    eval "$(gh completion --shell=bash)"
+	# If gh already completed, stop
+	_completion_exists gh && return
+	eval "$(gh completion --shell=bash)"
 fi