Fixed "BUG: shortcut for existing layout is marked as already used when editing that layout"