diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts
index d536c48b044..32a172fc8e9 100644
--- a/public/app/core/components/code_editor/code_editor.ts
+++ b/public/app/core/components/code_editor/code_editor.ts
@@ -24,21 +24,33 @@ function link(scope, elem, attrs) {
   let langMode = attrs.mode || 'text';
   let theme = "solarized_dark";
 
+  // Initialize editor
   let aceElem = elem.get(0);
   let codeEditor = ace.edit(aceElem);
   let editorSession = codeEditor.getSession();
 
-  codeEditor.setHighlightActiveLine(false);
-  codeEditor.setShowPrintMargin(false);
+  let editorOptions = {
+    maxLines: 10,
+    showGutter: false,
+    highlightActiveLine: false,
+    showPrintMargin: false,
+    autoScrollEditorIntoView: true // this is needed if editor is inside scrollable page
+  };
+
+  // Set options
+  codeEditor.setOptions(editorOptions);
   // disable depreacation warning
   codeEditor.$blockScrolling = Infinity;
-  codeEditor.setAutoScrollEditorIntoView(true);
+  // Padding hacks
+  codeEditor.renderer.setScrollMargin(10, 10);
+  codeEditor.renderer.setPadding(10);
   setThemeMode(theme);
   setLangMode(langMode);
 
   codeEditor.setValue(scope.content);
   codeEditor.clearSelection();
 
+  // Add classes
   elem.addClass("gf-code-editor");
   let textarea = elem.find("textarea");
   textarea.addClass('gf-form-input');
diff --git a/public/sass/components/_code_editor.scss b/public/sass/components/_code_editor.scss
index bedd539278f..f41c7960ec9 100644
--- a/public/sass/components/_code_editor.scss
+++ b/public/sass/components/_code_editor.scss
@@ -6,7 +6,7 @@
   border: 1px solid #333333;
 
   &.ace_editor {
-    min-height: 6rem;
+    min-height: 2.60rem;
     font-family: monospace;
     font-size: 1rem;
   }