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

             "Mismatch in storyboard column identifier and OptionLevel enum")
      return
    }
    let optionNode = optionNodeForItem(editor.itemAtRow(editor.clickedRow)!, outlineView: editor)

    // Verify that the column is editable.
    if OptionsEditorController.bindingsControlledColumns.contains(columnIdentifier) ||

  private func reloadDataForRow(row: Int) {
    guard row >= 0 else { return }
    let item = view.itemAtRow(row)!
    reloadDataForItem(item)
  }

  private func reloadDataForItem(item: AnyObject?) {
    let indexes = NSMutableIndexSet(index: view.rowForItem(item))
    if let parent = view.parentForItem(item) {
      indexes.addIndex(view.rowForItem(parent))
    } else {
