diff --git a/lib/constants.js b/lib/constants.js
index 6833344..9849e8e 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -345,6 +345,7 @@ export const LANGUAGE_MODE_HASH = toHash(LANGUAGES, 'mode')
 export const LANGUAGE_NAME_HASH = toHash(LANGUAGES, 'short')
 
 export const DEFAULT_LANGUAGE = 'auto'
+export const DEFAULT_THEME = THEMES_HASH.seti
 
 export const COLORS = {
   BLACK: '#121212',
diff --git a/pages/editor.js b/pages/editor.js
index 3f51c9b..980348e 100644
--- a/pages/editor.js
+++ b/pages/editor.js
@@ -22,6 +22,7 @@ import {
   LANGUAGE_MIME_HASH,
   LANGUAGE_MODE_HASH,
   DEFAULT_LANGUAGE,
+  DEFAULT_THEME,
   COLORS,
   DEFAULT_CODE
 } from '../lib/constants'
@@ -55,7 +56,7 @@ class Editor extends React.Component {
     this.state = Object.assign(
       {
         background: 'rgba(171, 184, 195, 1)',
-        theme: THEMES_HASH.seti.id,
+        theme: DEFAULT_THEME.id,
         language: DEFAULT_LANGUAGE,
         dropShadow: true,
         windowControls: true,
@@ -140,8 +141,8 @@ class Editor extends React.Component {
         <div id="editor">
           <Toolbar>
             <Dropdown
-              selected={THEMES_HASH[this.state.theme]}
-              list={THEMES.filter(t => t.name)}
+              selected={THEMES_HASH[this.state.theme] || DEFAULT_THEME}
+              list={THEMES}
               onChange={theme => this.setState({ theme: theme.id })}
             />
             <Dropdown