diff --git a/app/components/base/Editor.js b/app/components/base/Editor.js
index 66b33413b5..09a62256c9 100644
--- a/app/components/base/Editor.js
+++ b/app/components/base/Editor.js
@@ -124,6 +124,9 @@ class Editor extends Component {
   _codemirrorSetOptions (options) {
     // Clone first so we can modify it
     options = Object.assign({}, options);
+
+    // Strip of charset if there is one
+    options.mode = options.mode.split(';')[0];
     
     if (options.mode === 'json') {
       options.mode = 'application/json';
diff --git a/app/containers/App.js b/app/containers/App.js
index 189e7c988d..c51542b08d 100644
--- a/app/containers/App.js
+++ b/app/containers/App.js
@@ -16,8 +16,6 @@ import * as RequestGroupActions from '../actions/requestGroups'
 import * as RequestActions from '../actions/requests'
 import * as ResponseActions from '../actions/responses'
 
-import {DEFAULT_FONT_SIZE} from '../constants/global';
-
 // Don't inject component styles (use our own)
 Tabs.setUseDefaultStyles(false);
 
@@ -134,33 +132,13 @@ class App extends Component {
     )
   }
 
-  componentDidMount () {
-    document.documentElement.style.fontSize = DEFAULT_FONT_SIZE;
-  }
-
-  _keyDown (e) {
-    if (e.metaKey) {
-      if (e.keyCode === 189) { // MINUS
-        let fontSize = parseFloat(document.documentElement.style.fontSize);
-        document.documentElement.style.fontSize = `${fontSize - 0.5}px`;
-      } else if (e.keyCode === 187) { // EQUALS
-        let fontSize = parseFloat(document.documentElement.style.fontSize);
-        document.documentElement.style.fontSize = `${fontSize + 0.5}px`;
-      } else if (e.keyCode === 48) { // ZERO
-        document.documentElement.style.fontSize = DEFAULT_FONT_SIZE;
-      } else {
-        // console.log('CTRL + ' + e.keyCode);
-      }
-    }
-  }
-
   render () {
-    const {actions, requests, responses, requestGroups, prompt, tabs} = this.props;
+    const {actions, requests, responses, requestGroups, tabs} = this.props;
     const activeRequest = requests.all.find(r => r.id === requests.active);
     const activeResponse = responses[activeRequest && activeRequest.id];
 
     return (
-      <div className="grid bg-super-dark tall" onKeyDown={this._keyDown.bind(this)}>
+      <div className="grid bg-super-dark tall">
         <Modals />
         <Sidebar
           activateRequest={actions.activateRequest}