[Issue #289] Fixes regression for evil-mode users

let me know if there's anything you'd like to change.  cheers.