diff --git a/app/renderer/components/navigation/navigator.js b/app/renderer/components/navigation/navigator.js
index c198ba4d4e..137d7a2127 100644
--- a/app/renderer/components/navigation/navigator.js
+++ b/app/renderer/components/navigation/navigator.js
@@ -153,7 +153,8 @@ class Navigator extends React.Component {
     const activeTab = tabState.getByTabId(state, activeTabId)
     const activeTabShowingMessageBox = !!(activeTab && tabState.isShowingMessageBox(state, activeTabId))
     const allSiteSettings = siteSettingsState.getAllSiteSettings(state, activeFrame)
-    const braverySettings = siteSettings.activeSettings(allSiteSettings, state, appConfig)
+    const activeSiteSettings = siteSettings.getSiteSettingsForURL(allSiteSettings, activeFrame.get('location'))
+    const braverySettings = siteSettings.activeSettings(activeSiteSettings, state, appConfig)
     const enabledExtensions = extensionState.getEnabledExtensions(state)
     const extensionBrowserActions = enabledExtensions
       .map((extension) => {
@@ -254,6 +255,7 @@ class Navigator extends React.Component {
               <Button iconClass='braveMenu'
                 l10nId='braveMenu'
                 testId='braveShieldButton'
+                test2Id={`shield-down-${this.props.shieldsDown}`}
                 className={cx({
                   braveShieldsDisabled: !this.props.shieldEnabled,
                   braveShieldsDown: this.props.shieldsDown,
diff --git a/js/components/braveryPanel.js b/js/components/braveryPanel.js
index a25dd1187c..41bf365a63 100644
--- a/js/components/braveryPanel.js
+++ b/js/components/braveryPanel.js
@@ -150,7 +150,6 @@ class BraveryPanel extends ImmutableComponent {
     if (setting !== 'noScript' && (parsedUrl.protocol === 'https:' || parsedUrl.protocol === 'http:')) {
       ruleKey = `https?://${parsedUrl.host}`
     }
-    console.log(e.target.value)
     appActions.changeSiteSetting(ruleKey, setting, e.target.value, this.isPrivate)
     this.onReload()
   }
@@ -186,7 +185,15 @@ class BraveryPanel extends ImmutableComponent {
           </div>
           <div className='braveryPanelHeaderRight'>
             <div className='braveryShieldsUpDown'>
-              <SwitchControl onClick={this.onToggleShields} leftl10nId='shieldsDown' rightl10nId='shieldsUp' topl10nId='shields' checkedOn={shieldsUp} large />
+              <SwitchControl
+                onClick={this.onToggleShields}
+                leftl10nId='shieldsDown'
+                rightl10nId='shieldsUp'
+                topl10nId='shields'
+                testId='shields-toggle'
+                checkedOn={shieldsUp}
+                large
+              />
             </div>
           </div>
         </div>
diff --git a/test/navbar-components/navigatorTest.js b/test/navbar-components/navigatorTest.js
new file mode 100644
index 0000000000..7eb450b104
--- /dev/null
+++ b/test/navbar-components/navigatorTest.js
@@ -0,0 +1,34 @@
+/* global describe, it, beforeEach */
+
+const Brave = require('../lib/brave')
+const {urlInput, braveMenu, braveryPanel, braveryPanelContainer} = require('../lib/selectors')
+
+describe('navigator component tests', function () {
+  function * setup (client) {
+    yield client
+      .waitForUrl(Brave.newTabUrl)
+      .waitForBrowserWindow()
+      .waitForVisible(urlInput)
+  }
+
+  describe('lion badge', function () {
+    Brave.beforeEach(this)
+    beforeEach(function * () {
+      yield setup(this.app.client)
+    })
+
+    it('is grayed out if shield is disabled', function * () {
+      yield this.app.client
+        .tabByIndex(0)
+        .loadUrl('https://clifton.io/')
+        .windowByUrl(Brave.browserWindowUrl)
+        .waitForElementCount('[data-test2-id="shield-down-false"]', 1)
+        .openBraveMenu(braveMenu, braveryPanel)
+        .waitForElementCount('[data-test-id="shields-toggle"][data-switch-status="true"]', 1)
+        .click('[data-test-id="shields-toggle"] .switchBackground')
+        .waitForElementCount('[data-test-id="shields-toggle"][data-switch-status="false"]', 1)
+        .click(braveryPanelContainer)
+        .waitForElementCount('[data-test2-id="shield-down-true"]', 1)
+    })
+  })
+})