Then I arranged my desk, and put everything away, and was so composed and cheerful that I thought I had quite dismissed this unexpected incident. 
Then I arranged my desk, and put everything away, and was so composed and cheerful that I thought I had quite dismissed this unexpected incident. 