diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index a173d9e842..ad00cfb229 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -1,13 +1,7 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsController', function ($scope, loginService, $state, syncService, SweetAlert, utilsService) {
-        $scope.sync = function () {
-            syncService.fullSync(function () {
-                alert('Sync done!');
-            });
-        };
-
+    .controller('settingsController', function ($scope, loginService, $state, SweetAlert, utilsService) {
         $scope.logOut = function () {
             SweetAlert.swal({
                 title: 'Log Out',
diff --git a/src/popup/app/settings/settingsSyncController.js b/src/popup/app/settings/settingsSyncController.js
index bd86f3f272..ddf9ea791d 100644
--- a/src/popup/app/settings/settingsSyncController.js
+++ b/src/popup/app/settings/settingsSyncController.js
@@ -1,6 +1,25 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsSyncController', function ($scope) {
+    .controller('settingsSyncController', function ($scope, syncService, toastr) {
+        $scope.lastSync = '--';
+        setLastSync();
 
+        $scope.sync = function () {
+            syncService.fullSync(function () {
+                toastr.success('Syncing complete');
+                setLastSync();
+            });
+        };
+
+        function setLastSync() {
+            syncService.getLastSync(function (lastSync) {
+                if (lastSync) {
+                    $scope.lastSync = lastSync.toLocaleDateString() + ' ' + lastSync.toLocaleTimeString();
+                }
+                else {
+                    $scope.lastSync = 'Never';
+                }
+            });
+        }
     });
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index b390d71c62..4b79b34b05 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -34,7 +34,7 @@
                     Folders
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
-                <a class="list-section-item" href="" ng-click="sync()">
+                <a class="list-section-item" ui-sref="sync({animation: 'in-slide-left'})">
                     Sync
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
diff --git a/src/popup/app/settings/views/settingsSync.html b/src/popup/app/settings/views/settingsSync.html
index 18e51785c4..0a6da4ded1 100644
--- a/src/popup/app/settings/views/settingsSync.html
+++ b/src/popup/app/settings/views/settingsSync.html
@@ -5,5 +5,12 @@
     <div class="title">Sync</div>
 </div>
 <div class="content">
-    
+    <div class="centered-message">
+        <p style="margin-top: -50px;">
+            <a href="" class="btn btn-lg btn-link btn-block" ng-click="sync()">
+                Sync Vault Now
+            </a>
+            <small class="text-muted">Last Sync: {{lastSync}}</small>
+        </p>
+    </div>
 </div>