Fix buffer close shortcut