Fixed arrow button handling