diff --git a/desktop/menus/view-menu.js b/desktop/menus/view-menu.js
index eb8bf997a..d2fc84400 100644
--- a/desktop/menus/view-menu.js
+++ b/desktop/menus/view-menu.js
@@ -98,6 +98,10 @@ const buildViewMenu = settings => {
       {
         label: 'T&heme',
         submenu: [
+          {
+            label: '&System',
+            id: 'system',
+          },
           {
             label: '&Light',
             id: 'light',
@@ -106,10 +110,6 @@ const buildViewMenu = settings => {
             label: '&Dark',
             id: 'dark',
           },
-          {
-            label: '&System',
-            id: 'system',
-          },
         ].map(
           buildRadioGroup({
             action: 'activateTheme',
diff --git a/lib/dialogs/settings/panels/display.jsx b/lib/dialogs/settings/panels/display.jsx
index 6926c8d97..02088befd 100644
--- a/lib/dialogs/settings/panels/display.jsx
+++ b/lib/dialogs/settings/panels/display.jsx
@@ -102,9 +102,9 @@ const DisplayPanel = props => {
         onChange={actions.activateTheme}
         renderer={RadioGroup}
       >
+        <Item title="System" slug="system" />
         <Item title="Light" slug="light" />
         <Item title="Dark" slug="dark" />
-        <Item title="System" slug="system" />
       </SettingsGroup>
     </Fragment>
   );