Preserving sort order when returning from Form to Table window

WD21 apps: from a Table window I double left click a table entry to display it's associated FORM window; when I exit the FORM window the table's sort order undoes itself. How can I capture the table's sort order before the FORM window opens and then restore it when the focus returns to the TABLE window (and is there a tweak I can make elsewhere in the RAD template) to stop this unwanted behavior?

Simple test to confirm this problem: on a TABLE, manually sort the table by clicking column headers on two different columns (e.g. first click the STATE column and then the CITY column) - open the FORM window, close it and see what happens to the table's sort - it has changed on you :(