Index: src/wp-admin/js/theme-plugin-editor.js
===================================================================
--- src/wp-admin/js/theme-plugin-editor.js	(revision 42589)
+++ src/wp-admin/js/theme-plugin-editor.js	(working copy)
@@ -388,6 +388,15 @@
 		editor = wp.codeEditor.initialize( $( '#newcontent' ), codeEditorSettings );
 		editor.codemirror.on( 'change', component.onChange );
 
+		editor.codemirror.setOption( 'extraKeys', {
+            'Ctrl-S': function () {
+                component.form.submit();
+            },
+            'Cmd-S': function () {
+                component.form.submit();
+            }
+        });
+
 		// Improve the editor accessibility.
 		$( editor.codemirror.display.lineDiv )
 			.attr({