Done button bug fix
Merge commit 'd12d2f6586d47dd74bdcd56d50cf4de1314c2654'