diff --git a/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php b/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php
index 96566db..932cdd9 100644
--- a/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php
+++ b/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php
@@ -17,13 +17,13 @@ final class PhabricatorDashboardPanelTabsCustomField
     $names = $request->getArr($this->getFieldKey().'_name');
     $panel_ids = $request->getArr($this->getFieldKey().'_panelID');
     $panels = array();
-    foreach ($panel_ids as $panel_id) {
-      $panels[] = $panel_id[0];
+    foreach ($panel_ids as $idx => $panel_id) {
+      $panels[$idx] = $panel_id[0];
     }
     foreach ($names as $idx => $name) {
       $panel_id = idx($panels, $idx);
       if (strlen($name) && $panel_id) {
-        $value[] = array(
+        $value[$idx] = array(
           'name' => $name,
           'panelID' => $panel_id,
         );
@@ -88,21 +88,21 @@ final class PhabricatorDashboardPanelTabsCustomField
 
     $out = array();
     for ($ii = 1; $ii <= 6; $ii++) {
-      $tab = idx($value, ($ii - 1), array());
+      $tab = idx($value, $ii, array());
       $panel = idx($tab, 'panelID', null);
       $panel_id = array();
       if ($panel) {
         $panel_id[] = $panel;
       }
       $out[] = id(new AphrontFormTextControl())
-        ->setName($this->getFieldKey().'_name[]')
+        ->setName($this->getFieldKey().'_name['.$ii.']')
         ->setValue(idx($tab, 'name'))
         ->setLabel(pht('Tab %d Name', $ii));
 
       $out[] = id(new AphrontFormTokenizerControl())
         ->setUser($this->getViewer())
         ->setDatasource(new PhabricatorDashboardPanelDatasource())
-        ->setName($this->getFieldKey().'_panelID[]')
+        ->setName($this->getFieldKey().'_panelID['.$ii.']')
         ->setValue($panel_id)
         ->setLimit(1)
         ->setLabel(pht('Tab %d Panel', $ii));