diff --git a/src/sidebar/panel.js b/src/sidebar/panel.js
index d750bf03e..b34f7bd9c 100644
--- a/src/sidebar/panel.js
+++ b/src/sidebar/panel.js
@@ -122,8 +122,12 @@ ClassicEditor.create(document.querySelector('#editor'), {
               setAnimation(true); // animateSyncIcon, syncingLayout, warning
               syncingInProcess = true;
             }
-            if (! waitingToReconnect) {
-              savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
+            if (!waitingToReconnect) {
+              if (isAuthenticated) {
+                savingIndicator.textContent = browser.i18n.getMessage('syncProgress');
+              } else {
+                savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
+              }
             }
             // Disable sync-action
             editingInProcess = true;
@@ -139,7 +143,7 @@ ClassicEditor.create(document.querySelector('#editor'), {
             syncingInProcess = false;
             break;
           case 'text-saved':
-            if (! waitingToReconnect) {
+            if (! waitingToReconnect && ! isAuthenticated) {
               // persist reconnect warning, do not override with the 'saved at'
               savingIndicator.textContent = browser.i18n.getMessage('savedComplete2', formatFooterTime());
             }
@@ -285,7 +289,7 @@ function getLastSyncedTime() {
     isAuthenticated = true;
     setAnimation(false, true);
   } else {
-    savingIndicator.textContent = browser.i18n.getMessage('savedComplete2', formatFooterTime());
+    savingIndicator.textContent = browser.i18n.getMessage('changesSaved', formatFooterTime());
   }
 }