Fixed selection saving if no selection exists