diff --git a/.vimrc b/.vimrc
index 2f9e7649..4802d099 100644
--- a/.vimrc
+++ b/.vimrc
@@ -596,8 +596,8 @@ endfunction
 " Hashicorp Terraform
 function! TerraformValidate()
     " remove terraform plan copy-pasted removals for fast backporting
-    :%s/ [-~] //e
-    :%s/ -> .*//e
+    :%s/^[[:space:]]*[-~][[:space:]]//e
+    :%s/[[:space:]]->[[:space:]].*$//e
     :!clear; bash -c 'if [ -d "%:p:h"/.terraform ]; then cd "%:p:h"; fi; { terraform fmt -diff; terraform validate; } | more -R'
 endfunction