diff --git a/src/ui/LayoutEditor.tsx b/src/ui/LayoutEditor.tsx
index e2288be..d89ac56 100644
--- a/src/ui/LayoutEditor.tsx
+++ b/src/ui/LayoutEditor.tsx
@@ -85,6 +85,7 @@ export class LayoutEditor extends React.Component<Props, State> {
         const settings = this.state.showComponentSettings
             ? (
                 <SettingsComponent
+                    context={`component-settings$${this.state.editor.selected_component}`}
                     factory={LiveSplit.SettingValue}
                     state={this.state.editor.component_settings}
                     setValue={(index, value) => {
@@ -94,6 +95,7 @@ export class LayoutEditor extends React.Component<Props, State> {
                 />
             ) : (
                 <SettingsComponent
+                    context={`layout-settings`}
                     factory={LiveSplit.SettingValue}
                     state={this.state.editor.general_settings}
                     setValue={(index, value) => {
diff --git a/src/ui/RunEditor.tsx b/src/ui/RunEditor.tsx
index 75184fc..a03e220 100644
--- a/src/ui/RunEditor.tsx
+++ b/src/ui/RunEditor.tsx
@@ -779,6 +779,7 @@ export class RunEditor extends React.Component<Props, State> {
                     </table>
                 }
                 <SettingsComponent
+                    context="run-editor-variables"
                     factory={new JsonSettingValueFactory()}
                     state={{ fields }}
                     setValue={(index, value) => {
diff --git a/src/ui/Settings.tsx b/src/ui/Settings.tsx
index bc2bf1d..6db7120 100644
--- a/src/ui/Settings.tsx
+++ b/src/ui/Settings.tsx
@@ -7,6 +7,7 @@ import HotkeyButton from "./HotkeyButton";
 import ToggleCheckbox from "./ToggleCheckbox";
 
 export interface Props<T> {
+    context: string,
     setValue: (index: number, value: T) => void,
     state: ExtendedSettingsDescriptionJson,
     factory: SettingValueFactory<T>,
@@ -850,7 +851,7 @@ export class SettingsComponent<T> extends React.Component<Props<T>> {
             }
 
             settingsRows.push(
-                <tr>
+                <tr key={`${this.props.context}$${valueIndex}`}>
                     <td>{field.text}</td>
                     <td>{component}</td>
                 </tr>,
diff --git a/src/ui/SettingsEditor.tsx b/src/ui/SettingsEditor.tsx
index f3f2175..69e3ebb 100644
--- a/src/ui/SettingsEditor.tsx
+++ b/src/ui/SettingsEditor.tsx
@@ -39,6 +39,7 @@ export class SettingsEditor extends React.Component<Props, State> {
         return (
             <div className="settings-editor">
                 <SettingsComponent
+                    context="settings-editor"
                     factory={SettingValue}
                     state={this.state.settings}
                     setValue={(index, value) => {
diff --git a/src/ui/ToggleCheckbox.tsx b/src/ui/ToggleCheckbox.tsx
index bc0e031..9bae76f 100644
--- a/src/ui/ToggleCheckbox.tsx
+++ b/src/ui/ToggleCheckbox.tsx
@@ -18,7 +18,7 @@ export default class ToggleCheckbox extends React.Component<Props> {
         return (
             <div className="toggle-checkbox">
                 <Toggle
-                    defaultChecked={this.props.value}
+                    checked={this.props.value}
                     icons={false}
                     onChange={(event) => this.props.setValue(event.target.checked)}
                 />