diff --git a/htdocs/static/js/codemirror_exec.js b/htdocs/static/js/codemirror_exec.js
index 6d3e6ca..fcb9a3a 100644
--- a/htdocs/static/js/codemirror_exec.js
+++ b/htdocs/static/js/codemirror_exec.js
@@ -9,14 +9,11 @@ CM.init = function() {
 		CM.on = false;
 	} else {
 		CM.editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-			mode: CM.mode, //$('#codemirror_mode').text(),
+			mode: CM.mode,
 			lineNumbers: true,
 			lineWrapping: true,
 		});
 		CM.on = true;
-		if (CM.mode == 'php') {
-			CM.mode = 'javascript';
-		}
 	}
 };
 
@@ -27,4 +24,9 @@ $(document).ready(function() {
 		//$enable_codemirror.remove();
 		return false;
 	});
+	$langselect = $('#lang');
+	$langselect.change(function() {
+		CM.mode = $(this).val();
+		CM.init();
+	});
 });