diff --git a/doc/terminator_config.5 b/doc/terminator_config.5
index 02a71dfc..29ea1311 100644
--- a/doc/terminator_config.5
+++ b/doc/terminator_config.5
@@ -41,7 +41,7 @@ Control how focus is given to terminals. 'click' means the focus only moves to a
 Default value: \fBclick\fR
 .TP
 .B handle_size
-Controls the width of the separator between terminals. Anything outside the range 0-5 (inclusive) will be ignored and use your default theme value.
+Controls the width of the separator between terminals. Anything outside the range 0-20 (inclusive) will be ignored and use your default theme value.
 Default value: \fB-1\fR
 .TP
 .B geometry_hinting
diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade
index 7820e042..e7e5fd68 100644
--- a/terminatorlib/preferences.glade
+++ b/terminatorlib/preferences.glade
@@ -296,7 +296,7 @@
   </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-1</property>
-    <property name="upper">5</property>
+    <property name="upper">20</property>
     <property name="value">-1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">2</property>
diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py
index e3541bf9..4280a530 100755
--- a/terminatorlib/prefseditor.py
+++ b/terminatorlib/prefseditor.py
@@ -1036,8 +1036,8 @@ class PrefsEditor:
         """Handle size changed"""
         value = widget.get_value()  # This one is rounded according to the UI.
         value = int(value)          # Cast to int.
-        if value > 5:
-            value = 5
+        if value > 20:
+            value = 20
         self.config['handle_size'] = value
         self.config.save()
 
diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
index 6f73aec2..b8d763c5 100755
--- a/terminatorlib/terminator.py
+++ b/terminatorlib/terminator.py
@@ -373,7 +373,7 @@ class Terminator(Borg):
                 Gdk.Screen.get_default(),
                 self.style_provider)
             self.style_provider = None
-        if self.config['handle_size'] in xrange(0, 6):
+        if self.config['handle_size'] in xrange(0, 21):
             css = """
                 GtkPaned {
                     -GtkPaned-handle-size: %s