Autogenerated commit message is not shown after a conflict after cherry picking

Steps to reproduce:

1. cherry-pick a commit that results in a conflict
2. solve conflict
3. hit commit button

Actual: Commit message textbox is empty
Expected: The auto generated commit message (by Git) in the commit message textbox

If doing step 3 with TortoiseGit, the generated commit message is shown correctly. So SourceTree is just not filling the textbox correctly I assume.