diff --git a/src/background.js b/src/background.js
index cdc8f95a6..bfc714cec 100644
--- a/src/background.js
+++ b/src/background.js
@@ -192,7 +192,9 @@ browser.storage.local.get()
 // Handle onClick event for the toolbar button
 browser.browserAction.onClicked.addListener(() => {
   if (addonIsOpen) {
-    browser.sidebarAction.close();
+    browser.runtime.sendMessage('notes@mozilla.com', {
+      action: 'close'
+    });
   } else {
     browser.sidebarAction.open();
     setIconToActive();
diff --git a/src/sidebar/panel.js b/src/sidebar/panel.js
index d750bf03e..bb86de5c3 100644
--- a/src/sidebar/panel.js
+++ b/src/sidebar/panel.js
@@ -84,6 +84,9 @@ ClassicEditor.create(document.querySelector('#editor'), {
       chrome.runtime.onMessage.addListener(eventData => {
         let content;
         switch (eventData.action) {
+          case 'close':
+            browser.sidebarAction.close();
+            break;
           case 'sync-authenticated':
             setAnimation(true, true, false); // animateSyncIcon, syncingLayout, warning
             isAuthenticated = true;