diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96765635..b48540d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ from the final changelog of the release.
 Release date: TBD
 
 ### Improvements
-- Added spell checker for English, French, German, and Dutch.
+- Added spell checker for English, French, German, Spanish, and Dutch.
 - Removed "Display secure content only" option it's no longer necessary.
 
 #### Windows
diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 1cbe4733..742aa4a7 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -281,6 +281,34 @@ const SettingsPage = React.createClass({
         </Checkbox>);
     }
 
+    options.push(
+      <Checkbox
+        key='inputSpellChecker'
+        id='inputSpellChecker'
+        ref='useSpellChecker'
+        checked={this.state.useSpellChecker}
+        onChange={this.handleChangeUseSpellChecker}
+      >
+        {'Check spelling'}
+        <HelpBlock>
+          {'Highlight misspelled words in your messages.'}
+          {' Available for English, French, German, Spanish, and Dutch.'}
+        </HelpBlock>
+        <FormControl
+          id='selectSpellCheckerLocale'
+          componentClass='select'
+          value={this.state.spellCheckerLocale}
+          onChange={this.handleChangeSpellCheckerLocale}
+          disabled={!this.state.useSpellChecker}
+        >
+          <option value='en-US'>{'English'}</option>
+          <option value='fr-FR'>{'French'}</option>
+          <option value='de-DE'>{'German'}</option>
+          <option value='es-ES'>{'Spanish'}</option>
+          <option value='nl-NL'>{'Dutch'}</option>
+        </FormControl>
+      </Checkbox>);
+
     if (process.platform === 'darwin' || process.platform === 'win32') {
       const TASKBAR = process.platform === 'win32' ? 'taskbar' : 'Dock';
       options.push(
@@ -378,33 +406,6 @@ const SettingsPage = React.createClass({
         </Checkbox>);
     }
 
-    options.push(
-      <Checkbox
-        key='inputSpellChecker'
-        id='inputSpellChecker'
-        ref='useSpellChecker'
-        checked={this.state.useSpellChecker}
-        onChange={this.handleChangeUseSpellChecker}
-      >
-        {'Check spelling'}
-        <HelpBlock>
-          {'Highlight misspelled words in your messages.'}
-          {' Available for English, French, German, and Dutch.'}
-        </HelpBlock>
-        <FormControl
-          id='selectSpellCheckerLocale'
-          componentClass='select'
-          value={this.state.spellCheckerLocale}
-          onChange={this.handleChangeSpellCheckerLocale}
-          disabled={!this.state.useSpellChecker}
-        >
-          <option value='en-US'>{'English'}</option>
-          <option value='fr-FR'>{'French'}</option>
-          <option value='de-DE'>{'German'}</option>
-          <option value='nl-NL'>{'Dutch'}</option>
-        </FormControl>
-      </Checkbox>);
-
     const settingsPage = {
       navbar: {
         backgroundColor: '#fff'