I was annoyed by the same problem. I have raised a pull request with a proposed solution https://github.com/FreeCol/freecol/pull/128