diff --git a/UI/WebServerResources/angular-material b/UI/WebServerResources/angular-material
index bf5aa3511..9e56fcde7 160000
--- a/UI/WebServerResources/angular-material
+++ b/UI/WebServerResources/angular-material
@@ -1 +1 @@
-Subproject commit bf5aa3511ef8f849d54818ce1e2ac37f179f6f23
+Subproject commit 9e56fcde72046876228d6f27dbd778e54dbfa8d3
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index aefe67925..d65172748 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -457,6 +457,8 @@
     };
 
     this.save = function (form, options) {
+      this.adjustStartTime();
+      this.adjustEndTime();
       this.changeAlarmRelation(form);
       if (form.$valid) {
         this.component.$save(options)
@@ -581,12 +583,17 @@
     this.adjustEndTime = function () {
       var delta;
       if (this.component.end && this.endTime) {
-        // Update the component start date
+        // Update the component end date
         this.component.end.setHours(this.endTime.getHours());
         this.component.end.setMinutes(this.endTime.getMinutes());
         // The end date must be after the start date
         delta = oldEndDate.valueOf() - this.component.end.valueOf();
         if (delta !== 0) {
+          if (this.startTime) {
+            // Update the component start date
+            this.component.start.setHours(this.startTime.getHours());
+            this.component.start.setMinutes(this.startTime.getMinutes());
+          }
           delta = this.component.start.minutesTo(this.component.end);
           if (delta < 0) {
             this.component.end = new Date(oldEndDate.getTime());
diff --git a/UI/WebServerResources/package.json b/UI/WebServerResources/package.json
index 30f47f9b1..a7d79cf1e 100644
--- a/UI/WebServerResources/package.json
+++ b/UI/WebServerResources/package.json
@@ -8,7 +8,7 @@
     "angular-aria": "^1.8.0",
     "angular-cookies": "^1.8.0",
     "angular-file-upload": "^2.6.0",
-    "angular-material": "1.1.22",
+    "angular-material": "1.1.24",
     "angular-messages": "^1.8.0",
     "angular-sanitize": "^1.8.0",
     "angular-ui-router": "^1.0.26",
diff --git a/UI/WebServerResources/scss/components/input/_extends.scss b/UI/WebServerResources/scss/components/input/_extends.scss
index 9eae5fe4e..0518ae4bd 100644
--- a/UI/WebServerResources/scss/components/input/_extends.scss
+++ b/UI/WebServerResources/scss/components/input/_extends.scss
@@ -1,2 +1,3 @@
 /*! input/_extends.scss - */
-@import '../../../angular-material/src/components/input/input.scss';
\ No newline at end of file
+@import '../../../angular-material/src/components/input/input-variables.scss';
+@import '../../../angular-material/src/components/input/input.scss';