diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 6f52ec8c42..d9cb0ff21b 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -196,6 +196,15 @@ unalias wmRefresh
 unalias foamVersion
 unalias foamPV
 
+# Cleanup completions, which look like this:
+#   complete blockMesh 'p,*,`bash $WM_PROJECT_DIR/etc/ ...
+
+if ($?prompt && $?tcsh) then  # Interactive tcsh only
+    foreach cleaned (`complete | sed -n -e '/WM_PROJECT/s/\t.*$//p'`)
+        uncomplete $cleaned
+    end
+endif
+
 #------------------------------------------------------------------------------
 # Intermediate variables (do as last for a clean exit code)