diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index 6ad1ac3a27..ae595a7cf8 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -501,12 +501,6 @@ change_book_details_font_size_by = 0
 # No compile: compile_gpm_templates = False
 compile_gpm_templates = True
 
-#: Change the font size in the General Program Mode template editor
-# Change the font size used when editing GPM templates. This changes the size
-# of the font in the editing pane. Set it to a positive or
-# negative number to increase or decrease the font size.
-change_template_editor_font_size_by = 0
-
 #: What format to default to when using the Tweak feature
 # The Tweak feature of calibre allows direct editing of a book format.
 # If multiple formats are available, calibre will offer you a choice
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 374a872ef7..2068a3a6da 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -127,6 +127,7 @@ defs['show_highlight_toggle_button'] = False
 defs['add_comments_to_email'] = False
 defs['cb_preserve_aspect_ratio'] = False
 defs['show_rating_in_cover_browser'] = True
+defs['gpm_template_editor_font_size'] = 10
 del defs
 # }}}
 
diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index dd20b9e306..3960c62289 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -11,8 +11,8 @@ from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QSyntaxHighlighter, QFont,
 
 from calibre import sanitize_file_name_unicode
 from calibre.constants import config_dir
+from calibre.gui2 import gprefs
 from calibre.gui2.dialogs.template_dialog_ui import Ui_TemplateDialog
-from calibre.utils.config_base import tweaks
 from calibre.utils.formatter_functions import formatter_functions
 from calibre.utils.icu import sort_key
 from calibre.ebooks.metadata.book.base import Metadata
@@ -88,11 +88,9 @@ class TemplateHighlighter(QSyntaxHighlighter):
             Config["%sfontcolor" % name] = color
             Config["%sfontbold" % name] = bold
             Config["%sfontitalic" % name] = italic
-
         baseFormat = QTextCharFormat()
         baseFormat.setFontFamily(Config["fontfamily"])
-        Config["fontsize"] = (baseFormat.font().pointSize() +
-                                tweaks['change_template_editor_font_size_by'])
+        Config["fontsize"] = gprefs['gpm_template_editor_font_size']
         baseFormat.setFontPointSize(Config["fontsize"])
 
         for name in ("normal", "keyword", "builtin", "comment",
@@ -327,6 +325,14 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
                 '<a href="http://manual.calibre-ebook.com/template_ref.html">'
                 '%s</a>'%tt)
 
+        self.font_size_box.setValue(gprefs['gpm_template_editor_font_size'])
+        self.font_size_box.valueChanged.connect(self.font_size_changed)
+
+    def font_size_changed(self, toWhat):
+        gprefs['gpm_template_editor_font_size'] = toWhat
+        self.highlighter.initializeFormats()
+        self.highlighter.rehighlight()
+
     def filename_button_clicked(self):
         try:
             path = choose_files(self, 'choose_category_icon',
diff --git a/src/calibre/gui2/dialogs/template_dialog.ui b/src/calibre/gui2/dialogs/template_dialog.ui
index 1cc9f29f66..26d29e4cfe 100644
--- a/src/calibre/gui2/dialogs/template_dialog.ui
+++ b/src/calibre/gui2/dialogs/template_dialog.ui
@@ -166,17 +166,51 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Font size:</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="6" column="1">
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="1" column="0">
+        <widget class="QSpinBox" name="font_size_box"/>
+       </item>
+       <item row="1" column="1">
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="2">
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="7" column="0" colspan="2">
+      <widget class="QFrame">
+       <property name="frameShape">
+        <enum>QFrame::HLine</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Function &amp;name:</string>
@@ -186,10 +220,10 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="8" column="1">
       <widget class="QComboBox" name="function"/>
      </item>
-     <item row="8" column="0">
+     <item row="9" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>&amp;Documentation:</string>
@@ -202,7 +236,7 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
+     <item row="10" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Python &amp;code:</string>
@@ -215,7 +249,7 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="1">
+     <item row="9" column="1">
       <widget class="QPlainTextEdit" name="documentation">
        <property name="maximumSize">
         <size>
@@ -225,17 +259,17 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="1">
+     <item row="10" column="1">
       <widget class="QPlainTextEdit" name="source_code"/>
      </item>
-     <item row="10" column="1">
+     <item row="11" column="1">
       <widget class="QLabel" name="template_tutorial">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
+     <item row="12" column="1">
       <widget class="QLabel" name="template_func_reference">
        <property name="openExternalLinks">
         <bool>true</bool>