diff --git a/app/components/braveShields/braveShields.tsx b/app/components/braveShields/braveShields.tsx
index b5a6266..49dca00 100644
--- a/app/components/braveShields/braveShields.tsx
+++ b/app/components/braveShields/braveShields.tsx
@@ -27,12 +27,7 @@ export default class BraveShields extends React.Component<BraveShieldsProps, {}>
       <ShieldsPanel
         enabled={shieldsPanelTabData.braveShields !== 'block'}
         data-test-id='brave-shields-panel'
-        style={{
-          /* Hack to make the extension content match the default
-          browser action popup top/bottom border */
-          borderRadius: '2px',
-          minHeight: 'auto'
-        }}
+        style={{ borderRadius: '2px', minHeight: 'auto' }}
       >
         <BraveShieldsHeader
           tabData={shieldsPanelTabData}
diff --git a/app/components/braveShields/braveShieldsHeader.tsx b/app/components/braveShields/braveShieldsHeader.tsx
index 6e2c1eb..6c668e5 100644
--- a/app/components/braveShields/braveShieldsHeader.tsx
+++ b/app/components/braveShields/braveShieldsHeader.tsx
@@ -33,9 +33,27 @@ export interface BraveShieldsHeaderProps {
 }
 
 export default class BraveShieldsHeader extends React.PureComponent<BraveShieldsHeaderProps, {}> {
+  get enabledContent () {
+    return (
+      <EnabledText>
+        <Highlight enabled={true} size='large'>{getTotalResourcesBlocked(this.props.tabData)}</Highlight>
+        <Label size='medium'>{getMessage('totalBlocked')}</Label>
+      </EnabledText>
+    )
+  }
+
+  get disabledContent () {
+    return (
+      <DisabledText>
+        <ShieldIcon />
+        <Description enabled={false}>{getMessage('disabledMessage')}</Description>
+      </DisabledText>
+    )
+  }
+
   onToggleShields = (event: React.ChangeEvent<HTMLInputElement>) => {
     const { origin } = this.props.tabData
-    if (!isHttpOrHttps(origin)) {
+    if (!isHttpOrHttps(origin) || !event.target) {
       return
     }
     const shieldsOption: BlockOptions = event.target.checked ? 'allow' : 'block'
@@ -55,30 +73,12 @@ export default class BraveShieldsHeader extends React.PureComponent<BraveShields
           </Label>
           <Toggle id='mainToggle' size='large' checked={enabled} onChange={this.onToggleShields} />
         </HeaderToggle>
-        {
-          enabled
-            ? <Description enabled={true}>{getMessage('enabledMessage')}</Description>
-            : null
-        }
+          {enabled ? <Description enabled={true}>{getMessage('enabledMessage')}</Description> : null}
         <SiteCard>
           <EnabledText>
             <img src={getFavicon(url)} />
             <Label size='large'>{hostname}</Label></EnabledText>
-          {
-            enabled
-              ? (
-                <EnabledText>
-                  <Highlight enabled={true} size='large'>{getTotalResourcesBlocked(this.props.tabData)}</Highlight>
-                  <Label size='medium'>{getMessage('totalBlocked')}</Label>
-                </EnabledText>
-              )
-              : (
-                <DisabledText>
-                  <ShieldIcon />
-                  <Description enabled={false}>{getMessage('disabledMessage')}</Description>
-                </DisabledText>
-              )
-          }
+            {enabled ? this.enabledContent : this.disabledContent}
         </SiteCard>
       </Header>
     )
diff --git a/app/components/braveShields/interfaceControls.tsx b/app/components/braveShields/interfaceControls.tsx
index 86d6837..836fd1e 100644
--- a/app/components/braveShields/interfaceControls.tsx
+++ b/app/components/braveShields/interfaceControls.tsx
@@ -25,10 +25,10 @@ export default class InterfaceControls extends React.PureComponent<Props, {}> {
   }
 
   onChangeBlockAds = (event: React.ChangeEvent<HTMLInputElement>) => {
-    if (typeof event.target === 'undefined') {
+    if (!event.target) {
       return
     }
-    const shoudEnableAdsTracks = event.target.checked ? 'allow' : 'block'
+    const shoudEnableAdsTracks: BlockOptions = event.target.checked ? 'allow' : 'block'
     this.props.blockAdsTrackers(shoudEnableAdsTracks)
   }
 
diff --git a/app/components/braveShields/privacyControls.tsx b/app/components/braveShields/privacyControls.tsx
index 2d656c0..81fcc8a 100644
--- a/app/components/braveShields/privacyControls.tsx
+++ b/app/components/braveShields/privacyControls.tsx
@@ -23,21 +23,21 @@ interface Props {
 
 export default class PrivacyControls extends React.PureComponent<Props, {}> {
   onChangeCookiesProtection = (event: React.ChangeEvent<any>) => {
-    if (typeof event.target === 'undefined') {
+    if (!event.target) {
       return
     }
     this.props.blockCookies(event.target.value)
   }
 
   onChangeJavaScriptProtection = (event: React.ChangeEvent<any>) => {
-    if (typeof event.target === 'undefined') {
+    if (!event.target) {
       return
     }
     this.props.blockJavaScript(event.target.value)
   }
 
   onChangeFingerprintingProtection = (event: React.ChangeEvent<any>) => {
-    if (typeof event.target === 'undefined') {
+    if (!event.target) {
       return
     }
     this.props.blockFingerprinting(event.target.value)
diff --git a/app/helpers/shieldsUtils.ts b/app/helpers/shieldsUtils.ts
index bdde095..cd8977d 100644
--- a/app/helpers/shieldsUtils.ts
+++ b/app/helpers/shieldsUtils.ts
@@ -5,7 +5,7 @@
 import { Tab } from '../types/state/shieldsPannelState'
 
 export const getTotalResourcesBlocked = (tabData: Partial<Tab>) => {
-  if (typeof tabData === 'undefined') {
+  if (!tabData) {
     return 0
   }
   return (
diff --git a/app/types/other/blockTypes.ts b/app/types/other/blockTypes.ts
index 8254a98..d4bc0ad 100644
--- a/app/types/other/blockTypes.ts
+++ b/app/types/other/blockTypes.ts
@@ -6,4 +6,4 @@ export type BlockTypes = 'ads' | 'trackers' | 'httpUpgradableResources' | 'javas
 export type BlockOptions = 'allow' | 'block'
 export type BlockFPOptions = 'allow' | 'block' | 'block_third_party'
 export type BlockCookiesOptions = 'allow' | 'block' | 'block_third_party'
-export type BlockJSOptions = 'allow' | 'block' | 'block_third_party'
\ No newline at end of file
+export type BlockJSOptions = 'allow' | 'block' | 'block_third_party'