diff --git a/chrome/browser/resources/chromeos/login/gaia_dialog.js b/chrome/browser/resources/chromeos/login/gaia_dialog.js
index 00dee20a153060..c8ffab1b9c70b8 100644
--- a/chrome/browser/resources/chromeos/login/gaia_dialog.js
+++ b/chrome/browser/resources/chromeos/login/gaia_dialog.js
@@ -212,9 +212,11 @@ Polymer({
       },
       'dialogShown': (e) => {
         this.navigationEnabled = false;
+        chrome.send('enableShelfButtons', [false]);
       },
       'dialogHidden': (e) => {
         this.navigationEnabled = true;
+        chrome.send('enableShelfButtons', [true]);
       },
       'exit': (e) => {
         this.fire('exit', e.detail);