diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 711139ef0..667a9fdc0 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -21,6 +21,7 @@ plugins=(... terraform)
 | `tfa`   | `terraform apply`                      |
 | `tfa!`  | `terraform apply -auto-approve`        |
 | `tfap`  | `terraform apply -parallelism=1`       |
+| `tfapp` | `terraform apply tfplan`               |
 | `tfc`   | `terraform console`                    |
 | `tfd`   | `terraform destroy`                    |
 | `tfd!`  | `terraform destroy -auto-approve`      |
@@ -33,6 +34,7 @@ plugins=(... terraform)
 | `tfiur` | `terraform init -upgrade -reconfigure` |
 | `tfo`   | `terraform output`                     |
 | `tfp`   | `terraform plan`                       |
+| `tfpo`  | `terraform plan -out tfplan`           |
 | `tfv`   | `terraform validate`                   |
 | `tfs`   | `terraform state`                      |
 | `tft`   | `terraform test`                       |
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 8e57b00db..36a1c2ca6 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -1,3 +1,8 @@
+# Return immediately if terraform is not found
+if (( ! ${+commands[terraform]} )); then
+  return
+fi
+
 function tf_prompt_info() {
   # dont show 'default' workspace in home dir
   [[ "$PWD" != ~ ]] || return