This would be a really nice QoL improvement.