fixup! Native Commit Window