diff --git a/js/components/frame.js b/js/components/frame.js
index 87544fcbdb1..d41cc72370c 100644
--- a/js/components/frame.js
+++ b/js/components/frame.js
@@ -114,7 +114,7 @@ class Frame extends ImmutableComponent {
         this.webview.send(messages.BRAVERY_DEFAULTS_UPDATED, this.props.braveryDefaults.toJS())
       }
       if (!Immutable.is(prevProps.extensions, this.props.extensions)) {
-        this.webview.send(messages.EXTENSIONS_UPDATED, this.props.extensions.toJS())
+        this.webview.send(messages.EXTENSIONS_UPDATED, this.props.extensions ? this.props.extensions.toJS() : null)
       }
     } else if (location === 'about:bookmarks' && this.props.bookmarks) {
       if (!Immutable.is(prevProps.bookmarks, this.props.bookmarks) ||
diff --git a/js/components/tab.js b/js/components/tab.js
index bc952afd431..74c9245dee0 100644
--- a/js/components/tab.js
+++ b/js/components/tab.js
@@ -98,12 +98,27 @@ class Tab extends ImmutableComponent {
     } else if (this.props.tab.get('location') === 'about:newtab') {
       return locale.translation('newTab')
     }
+
+    // NOTE(bsclifton): this can't use a simple falsey check with fallback values
+    // since properties are involved. I believe the title is populated page is loaded
+    // (which means it uses location first). When title is truthy, React gets confused
+    // and renders the location (but shows the title in the DOM). This may be a bug in React.
+    //
+    // Here's a demo of the syntax which causes the problem:
+    // return this.props.tab.get('title') || this.props.tab.get('location') || ''
+
+    const title = this.props.tab && this.props.tab.get('title')
+    const location = this.props.tab && this.props.tab.get('location')
+    const display = typeof title === 'undefined'
+      ? typeof location === 'undefined'
+        ? ''
+        : location
+      : title
+
     // YouTube tries to change the title to add a play icon when
     // there is audio. Since we have our own audio indicator we get
     // rid of it.
-    return (this.props.tab.get('title') ||
-      this.props.tab.get('location') ||
-      '').replace('▶ ', '')
+    return display.replace('▶ ', '')
   }
 
   onDragStart (e) {