Feature #21 Fix by keyboard shortcut