Minor but important fix (keyboard shortcuts could fail to work)