Removed most of the click when switching buffers

Signed-off-by: Riccardo Binetti <punkerbino@gmail.com>