Possible fix for Issue #204: The [Done] button does not appear some times