diff --git a/ElectronClient/app/gui/ConfigScreen.jsx b/ElectronClient/app/gui/ConfigScreen.jsx
index 6a305546446..b2a5c4dac3f 100644
--- a/ElectronClient/app/gui/ConfigScreen.jsx
+++ b/ElectronClient/app/gui/ConfigScreen.jsx
@@ -59,7 +59,7 @@ class ConfigScreenComponent extends React.Component {
 			}
 
 			return (
-				<div key={key+value} style={rowStyle}>
+				<div key={key} style={rowStyle}>
 					<div style={labelStyle}><label>{md.label()}</label></div>
 					<select value={value} style={controlStyle} onChange={(event) => { updateSettingValue(key, event.target.value) }}>
 						{items}
@@ -72,9 +72,9 @@ class ConfigScreenComponent extends React.Component {
 			}
 
 			return (
-				<div key={key+value} style={rowStyle}>
+				<div key={key} style={rowStyle}>
 					<div style={controlStyle}>
-						<input id={'setting_checkbox_' + key} type="checkbox" defaultChecked={!!value} onChange={(event) => { onCheckboxClick(event) }}/><label onClick={(event) => { onCheckboxClick(event) }} style={labelStyle} htmlFor={'setting_checkbox_' + key}>{md.label()}</label>
+						<input id={'setting_checkbox_' + key} type="checkbox" checked={!!value} onChange={(event) => { onCheckboxClick(event) }}/><label onClick={(event) => { onCheckboxClick(event) }} style={labelStyle} htmlFor={'setting_checkbox_' + key}>{md.label()}</label>
 					</div>
 				</div>
 			);
@@ -86,7 +86,7 @@ class ConfigScreenComponent extends React.Component {
 			}
 
 			return (
-				<div key={key+value} style={rowStyle}>
+				<div key={key} style={rowStyle}>
 					<div style={labelStyle}><label>{md.label()}</label></div>
 					<input type="text" style={controlStyle} value={this.state.settings[key]} onChange={(event) => {onTextChange(event)}} />
 				</div>