diff --git a/applications/admin/static/js/ajax_editor.js b/applications/admin/static/js/ajax_editor.js
index 14b7c1ac..4a0560c4 100644
--- a/applications/admin/static/js/ajax_editor.js
+++ b/applications/admin/static/js/ajax_editor.js
@@ -248,5 +248,15 @@ function load_file (url) {
 	});
 }
 
+function set_font(editor, incr) {
+	var fontSize = '';
+	if (incr !== 0) {
+		fontSize = parseInt(jQuery(editor.getWrapperElement()).css('font-size'));
+		fontSize = fontSize + incr + "px";
+	}
+	jQuery(editor.getWrapperElement()).css('font-size', fontSize);
+	editor.refresh();
+}
+
 var template_js = '<p class="repo-name">{{{a_tag}}}</p><small>{{address}}</small>';
 
diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html
index acab1a91..1644024d 100644
--- a/applications/admin/views/default/edit.html
+++ b/applications/admin/views/default/edit.html
@@ -41,6 +41,7 @@
 <link rel="stylesheet" href="{{=URL('static/css','typeahead.js-bootstrap.css')}}">
 <script language="Javascript" type="text/javascript">
 var current_theme = "web2py";  //Default theme
+var current_font_incr = 0;	// Default font-size, 0 means don't set
 jQuery(document).on('shown click', 'a[data-toggle="tab"]', function (e) {
 	var tab_id = jQuery(this).attr('href');
 	var editor = jQuery(tab_id + " textarea").data('editor');
@@ -108,6 +109,22 @@ jQuery(document).on('click', '#themes a', function (e) {
 //#TODO save on session
 });
 
+// incr/decr editor font-size
+jQuery(document).on('click', 'a.font_button', function (e) {
+	e.preventDefault();
+	var id = jQuery(this).attr('id');
+	var new_font_incr;
+	switch (id) {
+		case 'incr': new_incr = 2; break;
+		case 'decr': new_incr = -2; break;
+		case 'default': new_incr = 0; break;
+	}
+	jQuery('textarea[name="data"]') .each(function(id, ta) {
+		editor = jQuery(ta).data('editor');
+		set_font(editor, new_incr);
+	});
+	current_font_incr = (new_incr !== 0) ? current_font_incr + new_incr : 0;
+});
 	function isFullScreen(instance) {
 		return /\bCodeMirror-fullscreen\b/.test(instance.getWrapperElement().className);
 	}
@@ -152,6 +169,11 @@ jQuery(document).on('click', '#themes a', function (e) {
 		{{pass}}
 	</ul>
 </div>
+<div class="btn-group">
+	<a id="decr" class="button btn font_button">-</a>
+	<a id="default" class="button btn font_button" >A</a>
+	<a id="incr" class="button btn font_button">+</a>
+</div>
 <div class="btn-group">
   {{=button(URL('design',args=request.vars.app if request.vars.app else request.args[0], anchor=request.vars.id), T('back'))}}
   {{#if request.args[1]=='models':}}
diff --git a/applications/admin/views/default/edit_js.html b/applications/admin/views/default/edit_js.html
index adc910d7..89f216d8 100644
--- a/applications/admin/views/default/edit_js.html
+++ b/applications/admin/views/default/edit_js.html
@@ -122,7 +122,7 @@
 		jQuery("#{{=id}} textarea").data('editor', editor);
 		var hlLine = editor.addLineClass(0, "background", "activeline");
 		window.mirror = editor; 	//backward compatibility
-
+		set_font(editor, current_font_incr);
 		doListBreakpoints({{=XML("'%s','%s://%s%s'" % (filename, 
 				request.env['wsgi_url_scheme'], request.env['http_host'],
 				URL(c='debug', f='list_breakpoints')))}}, editor);