diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
index 7354744..6b4bbbd 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
@@ -69,10 +69,14 @@
     };
 
 
-    alarmList.getHistoryData = function (nextPrev) {
+    alarmList.getHistoryData = function (nextPrev, updateDate) {
       if (nextPrev === 'next' && !alarmList.nextEnabled) {
         return;
       }
+            if(updateDate=='update'){
+                alarmList.toDateTime = new Date();
+                alarmList.toDateTime.setMilliseconds(0);
+            }
 
       var url = $location.absUrl();
       var config = {
diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
index 669f15c..043eef4 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
@@ -7,18 +7,18 @@
                 <label class="btn btn-primary"
                        ng-model="alarmList.radioModel"
                        uib-btn-radio="'activeAlarms'"
-                       ng-click="alarmList.getHistoryData('')">Active
+                       ng-click="alarmList.getHistoryData('', '')">Active
                     Alarms</label>
 
                 <label class="btn btn-primary"
                        ng-model="alarmList.radioModel"
-                       ng-click="alarmList.getHistoryData('')"
+                       ng-click="alarmList.getHistoryData('', 'update')"
                        uib-btn-radio="'historyAlarms'">Alarm History</label>
             </div>
             <div ng-hide="alarmList.radioModel === 'historyAlarms'"  class="themable-checkbox refreshBtn" >
-                 <input type="checkbox" ng-model="alarmList.checkboxAutoRefresh" id="themable-checkbox"                         ng-change="alarmList.autoRefreshChanged()">
-                 <label for="themable-checkbox" >Auto Refresh</label>
-             </div>
+                <input type="checkbox" ng-model="alarmList.checkboxAutoRefresh" id="themable-checkbox"                         ng-change="alarmList.autoRefreshChanged()">
+                <label for="themable-checkbox" >Auto Refresh</label>
+            </div>
             <div ng-show="alarmList.radioModel === 'historyAlarms'" style="display: inline;">
                 <label>Started</label>
 
@@ -29,7 +29,7 @@
                 <input type="datetime-local" ng-model="alarmList.toDateTime"/>
 
                 <button class="btn btn-primary"
-                        ng-click="alarmList.getHistoryData()">
+                        ng-click="alarmList.getHistoryData('', '')">
                     Fetch Alarms
                 </button>
             </div>