Fixed buttonless mode (again)