diff --git a/src/sql/parts/notebook/models/cell.ts b/src/sql/parts/notebook/models/cell.ts
index 84d7f2c485..f52f199073 100644
--- a/src/sql/parts/notebook/models/cell.ts
+++ b/src/sql/parts/notebook/models/cell.ts
@@ -484,15 +484,15 @@ export class CellModel implements ICellModel {
 		// Otherwise, default to python as the language
 		let languageInfo = this.languageInfo;
 		if (languageInfo) {
-			if (languageInfo.codemirror_mode) {
+			if (languageInfo.name) {
+				this._language = languageInfo.name;
+			} else if (languageInfo.codemirror_mode) {
 				let codeMirrorMode: nb.ICodeMirrorMode = <nb.ICodeMirrorMode>(languageInfo.codemirror_mode);
 				if (codeMirrorMode && codeMirrorMode.name) {
 					this._language = codeMirrorMode.name;
 				}
 			} else if (languageInfo.mimetype) {
 				this._language = languageInfo.mimetype;
-			} else if (languageInfo.name) {
-				this._language = languageInfo.name;
 			}
 		}
 
diff --git a/src/sql/parts/notebook/notebook.css b/src/sql/parts/notebook/notebook.css
index 1560142830..45364a574b 100644
--- a/src/sql/parts/notebook/notebook.css
+++ b/src/sql/parts/notebook/notebook.css
@@ -88,6 +88,7 @@
 .notebookEditor .notebook-cellTable {
 	margin-left: 20px;
 	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
 .notebookEditor .notebook-cellTable .ui-widget-content.slick-row {