ref #6596 Replace CTRL+S keybinding with our own binding