diff --git a/clean_files.txt b/clean_files.txt
index cbcbf12a0c..b51efbc6b4 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -121,6 +121,7 @@ plugins/available/python.plugin.bash
 plugins/available/rbenv.plugin.bash
 plugins/available/ruby.plugin.bash
 plugins/available/textmate.plugin.bash
+plugins/available/thefuck.plugin.bash
 plugins/available/todo.plugin.bash
 plugins/available/xterm.plugin.bash
 plugins/available/zoxide.plugin.bash
diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 31b77fa3de..37b3668adf 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -6,7 +6,7 @@
 _command_exists git || return
 
 # Don't handle completion if it's already managed
-if complete -p git &> /dev/null; then
+if _completion_exists git; then
 	_log_warning "completion already loaded - this usually means it is safe to stop using this completion"
 	return 0
 fi
diff --git a/plugins/available/thefuck.plugin.bash b/plugins/available/thefuck.plugin.bash
index 242a77df22..3c3f096ecc 100644
--- a/plugins/available/thefuck.plugin.bash
+++ b/plugins/available/thefuck.plugin.bash
@@ -1,9 +1,10 @@
+# shellcheck shell=bash
 cite about-plugin
 about-plugin 'Initialization for fuck'
 
 # https://github.com/nvbn/thefuck
 
 if _command_exists thefuck; then
-  # shellcheck disable=SC2046
-  eval $(thefuck --alias)
+	# shellcheck disable=SC2046
+	eval "$(thefuck --alias)"
 fi