diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx
index a96feb723..9080379a1 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -438,7 +438,7 @@ const CodeEditor = createClass({
 
 				// Extra data url chomping
 				// Try to make it pretty...
-				const startOfData = text.indexOf('data:');
+				const startOfData = text.indexOf('data:') > 0 ? text.indexOf('data:') : false;
 				if(startOfData) {
 					text = (startOfData > maxLength) ?
 						`${text.slice(0, text.indexOf(':') + 1)} ... ${text.slice(startOfData, startOfData + 5)} ...` :
diff --git a/shared/naturalcrit/codeEditor/fold-css.js b/shared/naturalcrit/codeEditor/fold-css.js
index a384d2fc2..f21eaef45 100644
--- a/shared/naturalcrit/codeEditor/fold-css.js
+++ b/shared/naturalcrit/codeEditor/fold-css.js
@@ -29,7 +29,7 @@ module.exports = {
 
 			// IMPORT FOLDING
 
-			const importMatcher = /^@import.*?;/;
+			const importMatcher = /^@import.*?[;]/;
 
 			if(activeLine.match(importMatcher)) {
 				return {