diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 7d4ee0382..74b3e8765 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -14,6 +14,7 @@ _ = require 'underscore'
 module.exports =
 class Editor extends View
   @configDefaults:
+    fontFamily: "Inconsolata, Monaco, Courier"
     fontSize: 20
     showInvisibles: false
     autosave: false
@@ -340,6 +341,7 @@ class Editor extends View
     @observeConfig 'editor.showInvisibles', (showInvisibles) => @setShowInvisibles(showInvisibles)
     @observeConfig 'editor.invisibles', (invisibles) => @setInvisibles(invisibles)
     @observeConfig 'editor.fontSize', (fontSize) => @setFontSize(fontSize)
+    @observeConfig 'editor.fontFamily', (fontFamily) => @setFontFamily(fontFamily)
 
   handleEvents: ->
     @on 'focus', =>
@@ -683,14 +685,25 @@ class Editor extends View
   setFontSize: (@fontSize) ->
     if fontSize?
       @css('font-size', fontSize + 'px')
-      return unless @attached
-      @calculateDimensions()
-      @updatePaddingOfRenderedLines()
-      @updateLayerDimensions()
-      @requestDisplayUpdate()
+      @redraw()
 
   getFontSize: -> @fontSize
 
+  setFontFamily: (@fontFamily) ->
+    if fontFamily?
+      @css('font-family', fontFamily)
+      @redraw()
+
+  getFontFamily: -> @fontFamily
+
+
+  redraw: ->
+    return unless @attached
+    @calculateDimensions()
+    @updatePaddingOfRenderedLines()
+    @updateLayerDimensions()
+    @requestDisplayUpdate()
+
   newSplitEditor: (editSession) ->
     new Editor { editSession: editSession ? @activeEditSession.copy() }
 
diff --git a/static/editor.css b/static/editor.css
index bdd9f2825..0b8cfb452 100644
--- a/static/editor.css
+++ b/static/editor.css
@@ -103,4 +103,4 @@
   position: absolute;
   pointer-events: none;
   z-index: -1;
-}
\ No newline at end of file
+}