diff --git a/sites/all/modules/contrib/og_menu/og_menu.module b/sites/all/modules/contrib/og_menu/og_menu.module
index d9c883e..0c3c3e2 100644
--- a/sites/all/modules/contrib/og_menu/og_menu.module
+++ b/sites/all/modules/contrib/og_menu/og_menu.module
@@ -496,9 +496,10 @@ function og_menu_form_menu_edit_menu_alter(&$form, &$form_state) {
     $options = array('' => '--');
     // Populate gids.
     if (user_access('administer group')) {
-      $result = db_query("SELECT distinct ogm.gid, n.title FROM {og_membership} ogm LEFT JOIN {node} n ON n.nid = ogm.gid WHERE entity_type='node'");
-      foreach ($result as $group) {
-        $options[$group->gid] = $group->title;
+      $gids = og_get_all_group('node');
+      $groups = node_load_multiple($gids);
+      foreach ($groups as $gid => $group) {
+        $options[$gid] = $group->title;
       }
     }
     else {