diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index e92bf52..0b39dd0 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -266,13 +266,15 @@ div.text_cell_render {
 }
 
 .CodeMirror {
-  line-height: 1.231;  /* Changed from 1em to our global default */
+    line-height: 1.231;  /* Changed from 1em to our global default */
 }
 
 .CodeMirror-scroll {
-  height: auto;     /* Changed to auto to autogrow */
-  overflow-y: visible; /* Changed from auto to remove scrollbar */
-  overflow-x: auto; /* Changed from auto to remove scrollbar */
+    height: auto;     /* Changed to auto to autogrow */
+    /*  The CodeMirror docs are a bit fuzzy on if overflow-y should be hidden or visible.*/
+    /*  We have found that if it is visible, vertical scrollbars appear with font size changes.*/
+    overflow-y: hidden;
+    overflow-x: auto; /* Changed from auto to remove scrollbar */
 }
 
 /* CSS font colors for translated ANSI colors. */
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index f0afcc9..9950d2f 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -62,7 +62,7 @@
                 <div class="section_row">
                     <span>
                         <select id="download_format">
-                            <option value="json">json</option>
+                            <option value="json">ipynb</option>
                             <option value="py">py</option>
                         </select>
                     </span>