diff --git a/.gitmodules b/.gitmodules
index ee2e084..62611b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,8 +7,8 @@
 	url = https://github.com/firebase/firepad.git
 [submodule "CodeMirror"]
 	path = CodeMirror
-	url = https://github.com/codemirror/CodeMirror
-	branch = direction
+	url = https://github.com/cben/CodeMirror
+	branch = master
 [submodule "firebase"]
 	path = firebase
 	url = https://github.com/firebase/firebase-bower.git
diff --git a/CodeMirror b/CodeMirror
index f65d506..7400165 160000
--- a/CodeMirror
+++ b/CodeMirror
@@ -1 +1 @@
-Subproject commit f65d50622518b9248aabaff96b3846fc7f32cd89
+Subproject commit 7400165077b655424159cd6cdf711c590f841fc0