diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index 6f65e008dc..7328ac3739 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -62,7 +62,7 @@
                         </li>
                         <li id="fldSelectInterval">
                             <label for="selectInterval">${LabelEveryXMinutes}</label>
-                            <select id="selectInterval" name="selectInterval">
+                            <select id="selectInterval">
                                 <option value="9000000000">15 minutes</option>
                                 <option value="18000000000">30 minutes</option>
                                 <option value="27000000000">45 minutes</option>
@@ -75,6 +75,10 @@
                                 <option value="432000000000">12 hours</option>
                             </select>
                         </li>
+                        <li>
+                            <label for="txtTimeLimit">${LabelTimeLimitHours}</label>
+                            <input id="txtTimeLimit" type="number" pattern="[0-9]*" min="1" step=".5" />
+                        </li>
                         <li>
                             <button type="submit" data-theme="b" data-icon="check">
                                 ${ButtonAdd}
diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js
index 144f047054..ec26e4c35d 100644
--- a/dashboard-ui/scripts/scheduledtaskpage.js
+++ b/dashboard-ui/scripts/scheduledtaskpage.js
@@ -40,7 +40,24 @@
             html += '<li>';
 
             html += '<a href="#">';
+
+            html += '<h3>';
             html += ScheduledTaskPage.getTriggerFriendlyName(trigger);
+            html += '</h3>';
+
+            if (trigger.MaxRuntimeMs) {
+                html += '<p>';
+
+                var hours = trigger.MaxRuntimeMs / 3600000;
+
+                if (hours == 1) {
+                    html += Globalize.translate('ValueTimeLimitSingleHour');
+                } else {
+                    html += Globalize.translate('ValueTimeLimitMultiHour', hours);
+                }
+                html += '</p>';
+            }
+
             html += '</a>';
 
             html += '<a href="#" onclick="ScheduledTaskPage.confirmDeleteTrigger(' + i + ');">';
@@ -278,6 +295,11 @@
             trigger.IntervalTicks = $('#selectInterval', page).val();
         }
 
+        var timeLimit = $('#txtTimeLimit', page).val() || '0';
+        timeLimit = parseFloat(timeLimit) * 3600000;
+
+        trigger.MaxRuntimeMs = timeLimit || null;
+
         return trigger;
     },