diff --git a/components/Settings.js b/components/Settings.js
index 5b5be51..b21d543 100644
--- a/components/Settings.js
+++ b/components/Settings.js
@@ -36,7 +36,11 @@ function WindowSettings({
 }) {
   return (
     <div className="settings-content">
-      <ThemeSelect selected={windowTheme || 'none'} onChange={onChange.bind(null, 'windowTheme')} />
+      <ThemeSelect
+        selected={windowTheme || 'none'}
+        windowControls={windowControls}
+        onChange={onChange}
+      />
       <div className="row">
         <Slider
           label="Padding (vert)"
@@ -71,11 +75,6 @@ function WindowSettings({
           />
         </div>
       )}
-      <Toggle
-        label="Window controls"
-        enabled={windowControls}
-        onChange={onChange.bind(null, 'windowControls')}
-      />
       <Toggle
         label="Auto-adjust width"
         enabled={widthAdjustment}
diff --git a/components/ThemeSelect.js b/components/ThemeSelect.js
index b6e17a3..8e66aee 100644
--- a/components/ThemeSelect.js
+++ b/components/ThemeSelect.js
@@ -1,4 +1,5 @@
 import React from 'react'
+import Toggle from './Toggle'
 import { None, BW, Sharp, Boxy } from './svg/WindowThemes'
 import { COLORS } from '../lib/constants'
 
@@ -7,7 +8,7 @@ const WINDOW_THEMES_MAP = { none: None, sharp: Sharp, bw: BW, boxy: Boxy }
 class ThemeSelect extends React.Component {
   select = theme => {
     if (this.props.selected !== theme) {
-      this.props.onChange(theme)
+      this.props.onChange('windowTheme', theme)
     }
   }
 
@@ -54,34 +55,37 @@ class ThemeSelect extends React.Component {
 
   render() {
     return (
-      <div className="window-theme">
-        <span className="label" id="window-theme-label">
-          Theme
-        </span>
-        <div className="themes" role="radiogroup" aria-labelledby="window-theme-label">
-          {this.renderThemes()}
-        </div>
-        <style jsx>
-          {`
-            .window-theme {
-              padding: 8px;
-            }
-
-            .window-theme span {
-              display: inline-block;
-              margin-bottom: 2px;
-            }
+      <>
+        <div className="window-theme">
+          <Toggle
+            label="Window controls"
+            enabled={this.props.windowControls}
+            onChange={v => this.props.onChange('windowControls', v)}
+          />
+          {this.props.windowControls && (
+            <div className="themes" role="radiogroup" aria-labelledby="window-theme-label">
+              {this.renderThemes()}
+            </div>
+          )}
+          <style jsx>
+            {`
+              .window-theme span {
+                display: inline-block;
+                margin-bottom: 2px;
+              }
 
-            .themes {
-              display: flex;
-              flex-direction: row;
-              width: 100%;
-              max-width: 200px;
-              overflow-x: scroll;
-            }
-          `}
-        </style>
-      </div>
+              .themes {
+                padding: 4px 8px 8px;
+                display: flex;
+                flex-direction: row;
+                width: 100%;
+                max-width: 200px;
+                overflow-x: scroll;
+              }
+            `}
+          </style>
+        </div>
+      </>
     )
   }
 }