I always seem to be caught out by it and would like it fixed. QOL improvements easy to implement (I think)