diff --git a/plugins/fabric/_fab b/plugins/fabric/_fab
index 9628e1224..4c2e61306 100644
--- a/plugins/fabric/_fab
+++ b/plugins/fabric/_fab
@@ -5,7 +5,7 @@ local curcontext=$curcontext state line
 declare -A opt_args
 
 declare target_list
-target_list=(`fab --shortlist 2>/dev/null`)
+target_list=(`fab --shortlist 2>/dev/null || fab --complete 2>/dev/null`)
 
 _targets() {
     _describe -t commands "fabric targets" target_list