Profile - GID Context Lost in Edit Flow

(Lobo - reassign if appropriate - wasn't sure how big a problem this is but may be more widespread than the cases below...??)

When "Edit" link is enabled for a Profile - and user goes to profile/edit - we "lose" the ufgroup ID and hence get a fatal error.

Two problem paths / 2 ways to recreate:
1. Cancel Button:
Go to http://dgg.qdev.civicrm.org/index.php?q=civicrm/profile&reset=1&gid=1
Search on State = CA
Click Edit link for a contact
Click Cancel button
...fatal error (no gid)

2. After edit and save
Go to http://dgg.qdev.civicrm.org/index.php?q=civicrm/profile&reset=1&gid=1
Search on State = CA
Click Edit link for a contact
Modify a field
(the 'view' screen appears)
Click "Back to Listings"
...fatal error (no gid)