diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 00947f72d..9b908bef0 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -41,7 +41,11 @@ fi
 
 # enable diff color if possible.
 if command diff --color /dev/null /dev/null &>/dev/null; then
-  alias diff='diff --color'
+  function color-diff {
+    diff --color $@
+  }
+  alias diff="color-diff"
+  compdef _diff color-diff # compdef is already loaded by this point
 fi
 
 setopt auto_cd