diff --git a/docs/html/config_timeshift.html b/docs/html/config_timeshift.html
index a23fda29..3265118b 100644
--- a/docs/html/config_timeshift.html
+++ b/docs/html/config_timeshift.html
@@ -30,7 +30,7 @@
       your storage media runs out of space (WARNING: this could be dangerous!).
 
   <!--
-  <dt>Max. Size (MB)
+  <dt>Max. Size (MegaBytes)
   <dd>Specifies the maximum combined size of all timeshift buffers. If you
       specify an unlimited period its highly recommended you specifying a value
       here.
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 76a12886..d637f384 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -2072,7 +2072,7 @@ extjs_timeshift(http_connection_t *hc, const char *remain, void *opaque)
     if (timeshift_path)
       htsmsg_add_str(m, "timeshift_path", timeshift_path);
     htsmsg_add_u32(m, "timeshift_unlimited_period", timeshift_unlimited_period);
-    htsmsg_add_u32(m, "timeshift_max_period", timeshift_max_period);
+    htsmsg_add_u32(m, "timeshift_max_period", timeshift_max_period / 60);
     htsmsg_add_u32(m, "timeshift_unlimited_size", timeshift_unlimited_size);
     htsmsg_add_u32(m, "timeshift_max_size", timeshift_max_size / 1048576);
     pthread_mutex_unlock(&global_lock);
@@ -2090,7 +2090,7 @@ extjs_timeshift(http_connection_t *hc, const char *remain, void *opaque)
     }
     timeshift_unlimited_period = http_arg_get(&hc->hc_req_args, "timeshift_unlimited_period") ? 1 : 0;
     if ((str = http_arg_get(&hc->hc_req_args, "timeshift_max_period")))
-      timeshift_max_period = (uint32_t)atol(str);
+      timeshift_max_period = (uint32_t)atol(str) * 60;
     timeshift_unlimited_size = http_arg_get(&hc->hc_req_args, "timeshift_unlimited_size") ? 1 : 0;
     if ((str = http_arg_get(&hc->hc_req_args, "timeshift_max_size")))
       timeshift_max_size   = atol(str) * 1048576LL;
diff --git a/src/webui/static/app/timeshift.js b/src/webui/static/app/timeshift.js
index e1a78aa9..059aae78 100644
--- a/src/webui/static/app/timeshift.js
+++ b/src/webui/static/app/timeshift.js
@@ -47,7 +47,7 @@ tvheadend.timeshift = function() {
   });
 
   var timeshiftUnlPeriod = new Ext.form.Checkbox({
-    fieldLabel: '  Unlimited',
+    fieldLabel: '&nbsp;&nbsp;&nbsp;(unlimited)',
     name: 'timeshift_unlimited_period',
     Width: 300
   });
@@ -56,13 +56,15 @@ tvheadend.timeshift = function() {
     fieldLabel: 'Max. Size (MB)',
     name: 'timeshift_max_size',
     allowBlank: false,
-    width: 300
+    width: 300,
+    hidden : true
   });
 
   var timeshiftUnlSize = new Ext.form.Checkbox({
-    fieldLabel: '  Unlimited',
+    fieldLabel: '&nbsp;&nbsp;&nbsp;(unlimited)',
     name: 'timeshift_unlimited_size',
-    Width: 300
+    Width: 300,
+    hidden : true
   });
 
   /* ****************************************************************