diff --git a/plugins/fuck/fuck.plugin.zsh b/plugins/fuck/fuck.plugin.zsh
deleted file mode 100644
index cbf8c09c..00000000
--- a/plugins/fuck/fuck.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ -n $commands[thefuck] ]]; then
-  alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
-  alias FUCK='fuck'
-else
-  echo 'thefuck is not installed, you should "pip install thefuck" first'
-fi
diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 81461d48..86ec9901 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -1,6 +1,14 @@
+if [[ -z $commands[thefuck] ]]; then
+    echo 'thefuck is not installed, you should "pip install thefuck" first'
+    return -1
+fi
+
+alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
+alias FUCK='fuck'
+
 fuck-command-line() {
-    FUCK=$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)
-    [ -z $FUCK ] && echo -n -e "\a" && return
+    FUCK="$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
+    [[ -z $FUCK ]] && echo -n -e "\a" && return
     BUFFER=$FUCK
     zle end-of-line
 }