--- og.module.5.x-3.x-dev.orig	2007-08-01 13:37:34.000000000 -0700
+++ og.module	2007-08-01 13:47:59.000000000 -0700
@@ -1494,7 +1494,20 @@ function og_form_add_og_audience($form_i
   elseif ($_POST['og_groups_hidden']) {
     $gids = unserialize($_POST['og_groups_hidden']);
   }
-  
+
+  /** Modification **
+   *
+   * http://www.scbbs.com/node/99/224#comment-224 
+   * http://drupal.org/node/130601
+   * If this is a node edit and we don't have already gids and there is a group context, then use
+   * current group context as gid[0]
+   */
+      $group_node = og_get_group_context();
+      if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'edit' && IS_NULL($gids) && ($group_node)) {
+        $gids[0] = $group_node->nid;
+      }
+  /** End Modification **/
+
   $node = $form['#node'];
   $required = variable_get('og_audience_required', 0) && !user_access('administer nodes');
   // determine the list of groups that are shown. node admins see all of them