diff --git a/app/browser/reducers/tabsReducer.js b/app/browser/reducers/tabsReducer.js
index 951e62f643..e1111ee2a4 100644
--- a/app/browser/reducers/tabsReducer.js
+++ b/app/browser/reducers/tabsReducer.js
@@ -133,7 +133,7 @@ const tabsReducer = (state, action) => {
     case windowConstants.WINDOW_SET_FRAME_ERROR:
       {
         const tabId = action.getIn(['frameProps', 'tabId'])
-        const tab = tabs.getWebContents(tabId)
+        const tab = getWebContents(tabId)
         if (tab) {
           let currentIndex = tab.getCurrentEntryIndex()
           let previousLocation = tab.getURL()
diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
index f231798bd6..0e0e67a254 100644
--- a/app/extensions/brave/locales/en-US/app.properties
+++ b/app/extensions/brave/locales/en-US/app.properties
@@ -104,6 +104,7 @@ partiallySecureConnectionInfo=This page was loaded over HTTPS, but some elements
 insecureConnection=Using an insecure connection
 insecureConnectionInfo=Your connection to this site is not private. An eavesdropper may be able to tamper with this page and read your data.
 phishingConnectionInfo=javascript:, data:, and blob: URLs are not secure and may be used for phishing attacks. Be careful when entering passwords and sensitive information!
+certErrConnectionInfo={{site}} does not have a valid HTTPS certificate. This may be caused by a misconfiguration or an attacker intercepting your connection.
 blockedTrackingElements={{blockedTrackingElementsSize}} Blocked tracking elements
 replacedAds={{replacedAdsSize}} Ads replaced
 blockedAds={{blockedAdsSize}} Ads blocked
diff --git a/app/index.js b/app/index.js
index e00547ec6f..b1b217f60f 100644
--- a/app/index.js
+++ b/app/index.js
@@ -399,11 +399,9 @@ app.on('ready', () => {
     ipcMain.on(messages.CHECK_CERT_ERROR_ACCEPTED, (event, host, frameKey) => {
       // If the host is associated with a URL with a cert error, update the
       // security state to insecure
-      if (acceptCertDomains[host]) {
-        event.sender.send(messages.SET_SECURITY_STATE, frameKey, {
-          secure: false
-        })
-      }
+      event.sender.send(messages.SET_SECURITY_STATE, frameKey, {
+        secure: 2
+      })
     })
 
     ipcMain.on(messages.GET_CERT_ERROR_DETAIL, (event, url) => {
diff --git a/app/renderer/components/navigation/urlBarIcon.js b/app/renderer/components/navigation/urlBarIcon.js
index fa666e94bf..4412d87dd1 100644
--- a/app/renderer/components/navigation/urlBarIcon.js
+++ b/app/renderer/components/navigation/urlBarIcon.js
@@ -31,7 +31,7 @@ class UrlBarIcon extends ImmutableComponent {
       // NOTE: EV style not approved yet; see discussion at https://github.com/brave/browser-laptop/issues/791
       if (this.props.isSecure === true) {
         return ['fa-lock']
-      } else if (this.props.isSecure === false) {
+      } else if (this.props.isSecure === false || this.props.isSecure === 2) {
         return ['fa-unlock', 'insecure-color']
       } else if (this.props.isSecure === 1) {
         return ['fa-unlock']
diff --git a/docs/state.md b/docs/state.md
index 411790547d..50e04eba61 100644
--- a/docs/state.md
+++ b/docs/state.md
@@ -473,7 +473,7 @@ WindowStore
     showFullScreenWarning: boolean, // true if a warning should be shown about full screen
     security: {
       blockedRunInsecureContent: Array<string>, // sources of blocked active mixed content
-      isSecure: (boolean|number), // true = fully secure, false = fully insecure, 1 = partially secure
+      isSecure: (boolean|number), // true = fully secure, false = fully insecure, 1 = partially secure, 2 = cert error
       loginRequiredDetail: {
         isProxy: boolean,
         host: string,
diff --git a/js/components/frame.js b/js/components/frame.js
index fefc271b8d..c2c481e7c8 100644
--- a/js/components/frame.js
+++ b/js/components/frame.js
@@ -759,8 +759,12 @@ class Frame extends ImmutableComponent {
       let runInsecureContent = this.runInsecureContent()
       if (e.securityState === 'secure') {
         isSecure = true
-      } else if (['broken', 'insecure'].includes(e.securityState)) {
+      } else if (e.securityState === 'insecure') {
         isSecure = false
+      } else if (e.securityState === 'broken') {
+        isSecure = false
+        const parsedUrl = urlParse(this.props.location)
+        ipc.send(messages.CHECK_CERT_ERROR_ACCEPTED, parsedUrl.host, this.props.frameKey)
       } else if (this.props.isSecure !== false &&
         ['warning', 'passive-mixed-content'].includes(e.securityState)) {
         // Passive mixed content should not upgrade an insecure connection to a
@@ -772,11 +776,6 @@ class Frame extends ImmutableComponent {
         secure: runInsecureContent ? false : isSecure,
         runInsecureContent
       })
-      if (isSecure) {
-        // Check that there isn't a cert error.
-        const parsedUrl = urlParse(this.props.location)
-        ipc.send(messages.CHECK_CERT_ERROR_ACCEPTED, parsedUrl.host, this.props.frameKey)
-      }
     })
     this.webview.addEventListener('load-start', (e) => {
       loadStart(e)
diff --git a/js/components/siteInfo.js b/js/components/siteInfo.js
index f99c4cb848..f0e4a99d97 100644
--- a/js/components/siteInfo.js
+++ b/js/components/siteInfo.js
@@ -137,6 +137,10 @@ class SiteInfo extends ImmutableComponent {
     let connectionInfo = null
     let viewCertificateButton = null
 
+    const certErrl10nArgs = {
+      site: this.location
+    }
+
     // TODO(Anthony): Hide it until muon support linux
     if (!platformUtil.isLinux()) {
       viewCertificateButton =
@@ -170,6 +174,7 @@ class SiteInfo extends ImmutableComponent {
               onClick={this.props.onHide}
             />
           </div>
+          {viewCertificateButton}
         </div>
     } else if (this.runInsecureContent) {
       connectionInfo =
@@ -187,6 +192,7 @@ class SiteInfo extends ImmutableComponent {
               onClick={this.onDenyRunInsecureContent}
             />
           </div>
+          {viewCertificateButton}
         </div>
     } else if (this.isSecure === true) {
       connectionInfo =
@@ -200,6 +206,12 @@ class SiteInfo extends ImmutableComponent {
           <div data-l10n-id='partiallySecureConnectionInfo' />
           {viewCertificateButton}
         </div>
+    } else if (this.isSecure === 2) {
+      connectionInfo =
+        <div className={css(styles.connectionInfo__wrapper)}>
+          <div data-l10n-id='certErrConnectionInfo' data-l10n-args={JSON.stringify(certErrl10nArgs)} />
+          {viewCertificateButton}
+        </div>
     } else {
       connectionInfo =
         <div className={css(styles.connectionInfo__wrapper)}>