diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index caa72dec..6979dc3f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -92,6 +92,10 @@
 		"message": "Disable",
 		"description": "Label for the button to disable a style"
 	},
+	"editGotoLine": {
+		"message": "Goto line (or line:col)",
+		"description": "Go to line or line:column on Ctrl-G in style code editor"
+	},
 	"editStyleHeading": {
 		"message": "Edit Style",
 		"description": "Title of the page for editing styles"
diff --git a/edit.html b/edit.html
index 4306c86f..65b1ecc4 100644
--- a/edit.html
+++ b/edit.html
@@ -29,6 +29,8 @@
 		<script src="codemirror/addon/hint/show-hint.js"></script>
 		<script src="codemirror/addon/hint/css-hint.js"></script>
 
+		<script src="codemirror/keymap/sublime.js"></script>
+
 		<style type="text/css">
 
 			body {
diff --git a/edit.js b/edit.js
index c44b41c8..1255226c 100644
--- a/edit.js
+++ b/edit.js
@@ -25,8 +25,26 @@ function setupCodeMirror(textarea) {
 		matchBrackets: true,
 		lint: CodeMirror.lint.css,
 		smartIndent: prefs.getPref("smart-indent"),
+		keyMap: "sublime",
 		extraKeys: {"Ctrl-Space": "autocomplete"}
 	});
+	cm.addKeyMap({
+		"Ctrl-G": function(cm) {
+			var cur = cm.getCursor();
+			cm.openDialog(t('editGotoLine') + ': <input type="text" style="width: 5em"/>', function(str) {
+				var m = str.match(/^\s*(\d+)(?:\s*:\s*(\d+))?\s*$/);
+				if (m) {
+					cm.setCursor(m[1] - 1, m[2] ? m[2] - 1 : cur.ch);
+				}
+			}, {value: cur.line+1});
+		},
+		"Alt-PageDown": function(cm) {
+			editors[(editors.indexOf(cm) + 1) % editors.length].focus();
+		},
+		"Alt-PageUp": function(cm) {
+			editors[(editors.indexOf(cm) - 1 + editors.length) % editors.length].focus();
+		}
+	});
 	cm.lastChange = cm.changeGeneration();
 	cm.on("change", indicateCodeChange);
 	editors.push(cm);