diff --git a/ui/src/admin/components/chronograf/ProvidersTableRow.js b/ui/src/admin/components/chronograf/ProvidersTableRow.js
index 8f40b08573..d758f28197 100644
--- a/ui/src/admin/components/chronograf/ProvidersTableRow.js
+++ b/ui/src/admin/components/chronograf/ProvidersTableRow.js
@@ -33,77 +33,22 @@ class ProvidersTableRow extends Component {
     onDelete(mapping)
   }
 
-  handleChangeProvider = provider => {
-    this.setState({provider})
-    const {scheme, organizationId, providerOrganization} = this.state
+  handleUpdateMapping = changes => {
     const {onUpdate, mapping: {id}} = this.props
-    const updatedMap = {
-      id,
-      scheme,
-      provider,
-      providerOrganization,
-      organizationId,
-    }
-    onUpdate(updatedMap)
+    const newState = {...this.state, ...changes, id}
+    this.setState(newState)
+    onUpdate(newState)
   }
 
-  handleChangeProviderOrg = providerOrganization => {
-    this.setState({providerOrganization})
-    const {onUpdate, mapping: {id}} = this.props
-    const {scheme, provider, organizationId} = this.state
-    const updatedMap = {
-      id,
-      scheme,
-      provider,
-      providerOrganization,
-      organizationId,
-    }
-    onUpdate(updatedMap)
-  }
+  handleChangeProvider = provider => this.handleUpdateMapping({provider})
 
-  handleChooseOrganization = org => {
-    const organizationId = org.id
-    this.setState({organizationId})
-    const {onUpdate, mapping: {id}} = this.props
-    const {scheme, provider, providerOrganization} = this.state
-    const updatedMap = {
-      id,
-      scheme,
-      provider,
-      providerOrganization,
-      organizationId,
-    }
-    onUpdate(updatedMap)
-  }
+  handleChangeProviderOrg = providerOrganization =>
+    this.handleUpdateMapping({providerOrganization})
 
-  handleChooseScheme = s => {
-    const scheme = s.text
-    this.setState({scheme})
-    const {onUpdate, mapping: {id}} = this.props
-    const {provider, providerOrganization, organizationId} = this.state
-    const updatedMap = {
-      id,
-      scheme,
-      provider,
-      providerOrganization,
-      organizationId,
-    }
-    onUpdate(updatedMap)
-  }
+  handleChooseOrganization = ({id: organizationId}) =>
+    this.handleUpdateMapping({organizationId})
 
-  handleUpdateMapping = () => {
-    // this was getting called by all the handlers for input/dropdown changes but it meant the state was not getting updated so the updated map was stale
-    const {onUpdate, mapping: {id}} = this.props
-    const {scheme, provider, providerOrganization, organizationId} = this.state
-    const updatedMap = {
-      id,
-      scheme,
-      provider,
-      providerOrganization,
-      organizationId,
-    }
-    onUpdate(updatedMap)
-  }
+  handleChooseScheme = ({text: scheme}) => this.handleUpdateMapping({scheme})
 
   render() {
     const {
@@ -143,12 +88,14 @@ class ProvidersTableRow extends Component {
           wrapperClass="fancytable--td provider--provider"
           onUpdate={this.handleChangeProvider}
           disabled={isDefaultMapping}
+          tabIndex="1"
         />
         <InputClickToEdit
           value={providerOrganization}
           wrapperClass="fancytable--td provider--providerorg"
           onUpdate={this.handleChangeProviderOrg}
           disabled={isDefaultMapping}
+          tabIndex="2"
         />
         <div className="fancytable--td provider--arrow">
           <span />
diff --git a/ui/src/shared/components/InputClickToEdit.js b/ui/src/shared/components/InputClickToEdit.js
index 0dfdcc594c..af422d5094 100644
--- a/ui/src/shared/components/InputClickToEdit.js
+++ b/ui/src/shared/components/InputClickToEdit.js
@@ -46,7 +46,7 @@ class InputClickToEdit extends Component {
 
   render() {
     const {isEditing, value} = this.state
-    const {wrapperClass, disabled} = this.props
+    const {wrapperClass, disabled, tabIndex} = this.props
 
     return disabled
       ? <div className={wrapperClass}>
@@ -54,7 +54,7 @@ class InputClickToEdit extends Component {
             {value}
           </div>
         </div>
-      : <div className={wrapperClass}>
+      : <div className={wrapperClass} tabIndex={tabIndex}>
           {isEditing
             ? <input
                 type="text"
@@ -81,6 +81,7 @@ InputClickToEdit.propTypes = {
   value: string,
   onUpdate: func.isRequired,
   disabled: bool,
+  tabIndex: string,
 }
 
 export default InputClickToEdit