diff --git a/dashboard/src/views/settings.html b/dashboard/src/views/settings.html
index ba072fe14..e04d75c31 100644
--- a/dashboard/src/views/settings.html
+++ b/dashboard/src/views/settings.html
@@ -252,7 +252,21 @@
   </div>
 
   <div class="text-left section-header">
-    <h3>{{ 'settings.updates.title' | tr }}</h3>
+    <h3>
+      {{ 'settings.updates.title' | tr }}
+      <div class="btn-group btn-group-sm pull-right">
+        <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="update.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'settings.updates.showLogsAction' | tr }}">
+          <i class="fas fa-align-left"></i> <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <li ng-repeat="task in update.tasks">
+            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
+            </a>
+          </li>
+        </ul>
+      </div>
+    </h3>
   </div>
 
   <div class="card" style="margin-bottom: 15px;">
@@ -286,7 +300,6 @@
     <div class="row" ng-show="update.busy">
       <div class="col-md-12">
         <p >{{ update.message }}</p>
-        <p class="has-error" ng-show="update.errorMessage">{{ update.errorMessage }}. <a ng-class="warning" ng-href="/logs.html?taskId={{update.taskId}}" target="_blank">{{ 'settings.updates.showLogsAction' | tr }}</a></p>
       </div>
     </div>
 
diff --git a/dashboard/src/views/settings.js b/dashboard/src/views/settings.js
index 861b092ef..a17b968a1 100644
--- a/dashboard/src/views/settings.js
+++ b/dashboard/src/views/settings.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /* global angular:false */
-/* global $:false */
+/* global $:false, TASK_TYPES */
 
 angular.module('Application').controller('SettingsController', ['$scope', '$location', '$translate', '$rootScope', '$timeout', 'Client', function ($scope, $location, $translate, $rootScope, $timeout, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
@@ -87,8 +87,16 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         percent: 0,
         message: 'Downloading',
         errorMessage: '', // this shows inline
-        taskId: '',
         skipBackup: false,
+        tasks: [],
+
+        refreshTasks: function () {
+            Client.getTasksByType(TASK_TYPES.TASK_UPDATE, function (error, tasks) {
+                if (error) return console.error(error);
+                $scope.update.tasks = tasks.slice(0, 10);
+                if ($scope.update.tasks.length && $scope.update.tasks[0].active) $scope.update.updateStatus();
+            });
+        },
 
         checkNow: function () {
             $scope.update.checking = true;
@@ -108,7 +116,9 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         },
 
         stopUpdate: function () {
-            Client.stopTask($scope.update.taskId, function (error) {
+            var taskId = $scope.update.tasks[0].id;
+
+            Client.stopTask(taskId, function (error) {
                 if (error) {
                     if (error.statusCode === 409) {
                         $scope.update.errorMessage = 'No update is currently in progress';
@@ -124,16 +134,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             });
         },
 
-        checkStatus: function () {
-            Client.getLatestTaskByType('update', function (error, task) {
-                if (error) return console.error(error);
-                if (!task) return;
-
-                $scope.update.taskId = task.id;
-                $scope.update.updateStatus();
-            });
-        },
-
         reloadIfNeeded: function () {
             Client.getStatus(function (error, status) {
                 if (error) return $scope.error(error);
@@ -143,7 +143,9 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         },
 
         updateStatus: function () {
-            Client.getTask($scope.update.taskId, function (error, data) {
+            var taskId = $scope.update.tasks[0].id;
+
+            Client.getTask(taskId, function (error, data) {
                 if (error) return window.setTimeout($scope.update.updateStatus, 5000);
 
                 if (!data.active) {
@@ -154,6 +156,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
                     if (!data.errorMessage) $scope.update.reloadIfNeeded(); // assume success
 
+                    $scope.update.refreshTasks(); // redundant... update the tasks list dropdown
+
                     return;
                 }
 
@@ -172,7 +176,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.update.message = '';
             $scope.update.errorMessage = '';
 
-            Client.update({ skipBackup: $scope.update.skipBackup }, function (error, taskId) {
+            Client.update({ skipBackup: $scope.update.skipBackup }, function (error /*, taskId */) {
                 if (error) {
                     $scope.update.error.generic = error.message;
                     $scope.update.busy = false;
@@ -181,8 +185,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
                 $('#updateModal').modal('hide');
 
-                $scope.update.taskId = taskId;
-                $scope.update.updateStatus();
+                $scope.update.refreshTasks();
             });
         }
     };
@@ -430,7 +433,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             });
         });
 
-        $scope.update.checkStatus();
+        $scope.update.refreshTasks();
 
         if ($scope.user.isAtLeastOwner) getSubscription();
     });