Fix default key behaviour