     }
 
     if popoverViewController.closeReason == .Accept {
-      reloadDataForRow(view.selectedRow)
+      reloadDataForItem(popoverViewController.optionItem)
     }
     popoverEditor = nil
   }

  private func reloadDataForRow(row: Int) {
    guard row >= 0 else { return }
    let item = view.itemAtRow(row)!
    let indexes = NSMutableIndexSet(index: row)
    if let parent = view.parentForItem(item) {
      indexes.addIndex(view.rowForItem(parent))
    } else {

        popoverViewController = storyboard.instantiateControllerWithIdentifier("OptionsEditorPopover") as? OptionsEditorPopoverViewController
      }
      popoverEditor.contentViewController = popoverViewController
      popoverViewController.optionItem = optionItem
      popoverViewController.setRepresentedOptionNode(optionNode, level: optionLevel)
      popoverViewController.popover = popoverEditor
      popoverEditor.delegate = self
