Changes to work with cmd+shift+e too