diff --git a/build/libifm.php b/build/libifm.php
index 37f1f72..fc6addd 100644
--- a/build/libifm.php
+++ b/build/libifm.php
@@ -484,9 +484,9 @@ f00bar;
 > {{i18n.soft_tabs}}</input>
 <div class="input-group"><span class="input-group-addon">{{i18n.tab_size}}</span><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}"></div>
 {{#ace_includes}}
-<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" name="folder_id">
+<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" id="editor-syntax">
 	{{#modes}}
-	<option value="mode-{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
+	<option value="ace/mode/{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
 	{{/modes}}
 </select>
 {{/ace_includes}}
@@ -1942,6 +1942,10 @@ function IFM( params ) {
 								self.editor.setOption( 'tabSize', e.srcElement.value );
 							}
 						});
+					else if( el.id == "editor-syntax" )
+						el.addEventListener( 'change', function( e ) {
+							self.editor.getSession().setMode( e.target.value );
+						});
 				});
 				return content;
 			}
diff --git a/ifm.php b/ifm.php
index f8dd6d0..d6c410e 100644
--- a/ifm.php
+++ b/ifm.php
@@ -484,9 +484,9 @@ f00bar;
 > {{i18n.soft_tabs}}</input>
 <div class="input-group"><span class="input-group-addon">{{i18n.tab_size}}</span><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}"></div>
 {{#ace_includes}}
-<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" name="folder_id">
+<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" id="editor-syntax">
 	{{#modes}}
-	<option value="mode-{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
+	<option value="ace/mode/{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
 	{{/modes}}
 </select>
 {{/ace_includes}}
@@ -1942,6 +1942,10 @@ function IFM( params ) {
 								self.editor.setOption( 'tabSize', e.srcElement.value );
 							}
 						});
+					else if( el.id == "editor-syntax" )
+						el.addEventListener( 'change', function( e ) {
+							self.editor.getSession().setMode( e.target.value );
+						});
 				});
 				return content;
 			}
diff --git a/src/ifm.js b/src/ifm.js
index 07ee3a0..acec388 100644
--- a/src/ifm.js
+++ b/src/ifm.js
@@ -487,6 +487,10 @@ function IFM( params ) {
 								self.editor.setOption( 'tabSize', e.srcElement.value );
 							}
 						});
+					else if( el.id == "editor-syntax" )
+						el.addEventListener( 'change', function( e ) {
+							self.editor.getSession().setMode( e.target.value );
+						});
 				});
 				return content;
 			}
diff --git a/src/templates/modal.file_editoroptions.html b/src/templates/modal.file_editoroptions.html
index 6e91c49..4b65fa0 100644
--- a/src/templates/modal.file_editoroptions.html
+++ b/src/templates/modal.file_editoroptions.html
@@ -10,9 +10,9 @@
 > {{i18n.soft_tabs}}</input>
 <div class="input-group"><span class="input-group-addon">{{i18n.tab_size}}</span><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}"></div>
 {{#ace_includes}}
-<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" name="folder_id">
+<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" id="editor-syntax">
 	{{#modes}}
-	<option value="mode-{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
+	<option value="ace/mode/{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
 	{{/modes}}
 </select>
 {{/ace_includes}}