Slightly better keyboard control