diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 4b6c8e42..0aee0f71 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -2,6 +2,8 @@
     position: relative;
     overflow: hidden;
     font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
+    font-size: 12px;
+    line-height: normal;
 }
 
 .ace_scroller {
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index cbd0ef71..d7a56fb2 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -342,6 +342,8 @@ var Editor = function(renderer, session) {
      * 
      **/
     this.setFontSize = function(size) {
+        if (typeof size == "number")
+            size = size + "px";
         this.container.style.fontSize = size;
         this.renderer.updateFontSize();
     };