diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 9b0eebbe8..bf9d837b0 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -2,6 +2,10 @@
 
 ## Future release
 
+### Enhancements
+
+ - Add ability to select system as a theme option and make it the default
+
 ### Fixes
 
  - Rework WordPress.com signin to prevent infinite looping and login failures [#1627](https://github.com/Automattic/simplenote-electron/pull/1627)
diff --git a/lib/app.jsx b/lib/app.jsx
index b9e8dfbd7..b51f04b54 100644
--- a/lib/app.jsx
+++ b/lib/app.jsx
@@ -309,8 +309,20 @@ export const App = connect(
         preferencesBucket: this.props.preferencesBucket,
       });
 
+    getSystemColorMode = () =>
+      window.matchMedia('(prefers-color-scheme: dark)').matches
+        ? 'dark'
+        : 'light';
+
+    getTheme = () => {
+      const {
+        settings: { theme },
+      } = this.props;
+      return 'system' === theme ? this.getSystemColorMode() : theme;
+    };
+
     initializeElectron = () => {
-      const remote = __non_webpack_require__('electron').remote; // eslint-disable-line no-undef
+      const { remote } = __non_webpack_require__('electron'); // eslint-disable-line no-undef
 
       this.setState({
         electron: {
@@ -404,7 +416,7 @@ export const App = connect(
       } = this.props;
       const isMacApp = isElectronMac();
 
-      const themeClass = `theme-${settings.theme}`;
+      const themeClass = `theme-${this.getTheme()}`;
 
       const appClasses = classNames('app', themeClass, {
         'is-line-length-full': settings.lineLength === 'full',
diff --git a/lib/dialogs/settings-group.jsx b/lib/dialogs/settings-group.jsx
index 5aa2dc776..0749c0a1c 100644
--- a/lib/dialogs/settings-group.jsx
+++ b/lib/dialogs/settings-group.jsx
@@ -27,11 +27,13 @@ export const SettingsGroup = ({
     </a>
   );
 
+  const childElements = React.Children.toArray(children).filter(o => o);
+
   return (
     <div className="settings-group">
       <PanelTitle headingLevel="3">{groupTitle}</PanelTitle>
       <div className="settings-items theme-color-border">
-        {React.Children.map(children, ({ props: { slug, title } }) => (
+        {childElements.map(({ props: { slug, title } }) => (
           <label
             className="settings-item theme-color-border"
             htmlFor={`settings-field-${groupSlug}-${slug}`}
diff --git a/lib/dialogs/settings/panels/display.jsx b/lib/dialogs/settings/panels/display.jsx
index ca94b44cd..082581ebe 100644
--- a/lib/dialogs/settings/panels/display.jsx
+++ b/lib/dialogs/settings/panels/display.jsx
@@ -102,6 +102,9 @@ const DisplayPanel = props => {
         onChange={actions.activateTheme}
         renderer={RadioGroup}
       >
+        {navigator.userAgent.toLowerCase().indexOf(' electron/') === -1 && (
+          <Item title="System" slug="system" />
+        )}
         <Item title="Light" slug="light" />
         <Item title="Dark" slug="dark" />
       </SettingsGroup>
diff --git a/lib/state/settings/reducer.js b/lib/state/settings/reducer.js
index 8717b28d7..400de1b8b 100644
--- a/lib/state/settings/reducer.js
+++ b/lib/state/settings/reducer.js
@@ -11,7 +11,7 @@ export const initialState = {
   sortTagsAlpha: false,
   sortType: 'modificationDate',
   spellCheckEnabled: true,
-  theme: 'light',
+  theme: 'system',
   wpToken: false,
 };