diff --git a/browser/components/loop/content/js/conversationViews.js b/browser/components/loop/content/js/conversationViews.js
index 3dbc3c272f0..a6e5067a5f0 100644
--- a/browser/components/loop/content/js/conversationViews.js
+++ b/browser/components/loop/content/js/conversationViews.js
@@ -124,8 +124,6 @@ loop.conversationViews = (function(mozL10n) {
     render: function() {
       var contactName = _getContactDisplayName(this.props.contact);
 
-      document.title = contactName;
-
       return (
         React.createElement("div", {className: "call-window"}, 
           React.createElement(CallIdentifierView, {
@@ -966,6 +964,7 @@ loop.conversationViews = (function(mozL10n) {
   var CallControllerView = React.createClass({displayName: "CallControllerView",
     mixins: [
       sharedMixins.AudioMixin,
+      sharedMixins.DocumentTitleMixin,
       loop.store.StoreMixin("conversationStore"),
       Backbone.Events
     ],
@@ -995,7 +994,7 @@ loop.conversationViews = (function(mozL10n) {
      * Used to setup and render the feedback view.
      */
     _renderFeedbackView: function() {
-      document.title = mozL10n.get("conversation_has_ended");
+      this.setTitle(mozL10n.get("conversation_has_ended"));
 
       return (
         React.createElement(sharedViews.FeedbackView, {
@@ -1033,6 +1032,14 @@ loop.conversationViews = (function(mozL10n) {
     },
 
     render: function() {
+      // Set the default title to the contact name or the callerId, note
+      // that views may override this, e.g. the feedback view.
+      if (this.state.contact) {
+        this.setTitle(_getContactDisplayName(this.state.contact));
+      } else {
+        this.setTitle(this.state.callerId || "");
+      }
+
       switch (this.state.callState) {
         case CALL_STATES.CLOSE: {
           this._closeWindow();
diff --git a/browser/components/loop/content/js/conversationViews.jsx b/browser/components/loop/content/js/conversationViews.jsx
index 77440dd73ee..cf6455e557c 100644
--- a/browser/components/loop/content/js/conversationViews.jsx
+++ b/browser/components/loop/content/js/conversationViews.jsx
@@ -124,8 +124,6 @@ loop.conversationViews = (function(mozL10n) {
     render: function() {
       var contactName = _getContactDisplayName(this.props.contact);
 
-      document.title = contactName;
-
       return (
         <div className="call-window">
           <CallIdentifierView
@@ -966,6 +964,7 @@ loop.conversationViews = (function(mozL10n) {
   var CallControllerView = React.createClass({
     mixins: [
       sharedMixins.AudioMixin,
+      sharedMixins.DocumentTitleMixin,
       loop.store.StoreMixin("conversationStore"),
       Backbone.Events
     ],
@@ -995,7 +994,7 @@ loop.conversationViews = (function(mozL10n) {
      * Used to setup and render the feedback view.
      */
     _renderFeedbackView: function() {
-      document.title = mozL10n.get("conversation_has_ended");
+      this.setTitle(mozL10n.get("conversation_has_ended"));
 
       return (
         <sharedViews.FeedbackView
@@ -1033,6 +1032,14 @@ loop.conversationViews = (function(mozL10n) {
     },
 
     render: function() {
+      // Set the default title to the contact name or the callerId, note
+      // that views may override this, e.g. the feedback view.
+      if (this.state.contact) {
+        this.setTitle(_getContactDisplayName(this.state.contact));
+      } else {
+        this.setTitle(this.state.callerId || "");
+      }
+
       switch (this.state.callState) {
         case CALL_STATES.CLOSE: {
           this._closeWindow();
diff --git a/browser/components/loop/test/desktop-local/conversationViews_test.js b/browser/components/loop/test/desktop-local/conversationViews_test.js
index 50477774fd1..afef74ec2ae 100644
--- a/browser/components/loop/test/desktop-local/conversationViews_test.js
+++ b/browser/components/loop/test/desktop-local/conversationViews_test.js
@@ -96,6 +96,7 @@ describe("loop.conversationViews", function () {
     fakeWindow = {
       navigator: { mozLoop: fakeMozLoop },
       close: sinon.stub(),
+      document: {},
       addEventListener: function() {},
       removeEventListener: function() {}
     };
@@ -172,28 +173,6 @@ describe("loop.conversationViews", function () {
     });
   });
 
-  describe("ConversationDetailView", function() {
-    function mountTestComponent(props) {
-      return TestUtils.renderIntoDocument(
-        React.createElement(loop.conversationViews.ConversationDetailView, props));
-    }
-
-    it("should set the document title to the calledId", function() {
-      mountTestComponent({contact: contact});
-
-      expect(document.title).eql("mrsmith");
-    });
-
-    it("should fallback to the email if the contact name is not defined",
-      function() {
-        delete contact.name;
-
-        mountTestComponent({contact: contact});
-
-        expect(document.title).eql("fakeEmail");
-      });
-  });
-
   describe("PendingConversationView", function() {
     function mountTestComponent(props) {
       return TestUtils.renderIntoDocument(
@@ -605,6 +584,37 @@ describe("loop.conversationViews", function () {
       });
     });
 
+    it("should set the document title to the callerId", function() {
+      store.setStoreState({
+        contact: contact
+      });
+
+      mountTestComponent();
+
+      expect(fakeWindow.document.title).eql("mrsmith");
+    });
+
+    it("should fallback to the contact email if the contact name is not defined", function() {
+      delete contact.name;
+      store.setStoreState({
+        contact: contact
+      });
+
+      mountTestComponent({contact: contact});
+
+      expect(fakeWindow.document.title).eql("fakeEmail");
+    });
+
+    it("should fallback to the caller id if no contact is defined", function() {
+      store.setStoreState({
+        callerId: "fakeId"
+      });
+
+      mountTestComponent({contact: contact});
+
+      expect(fakeWindow.document.title).eql("fakeId");
+    });
+
     it("should render the CallFailedView when the call state is 'terminated'",
       function() {
         store.setStoreState({
@@ -664,6 +674,14 @@ describe("loop.conversationViews", function () {
           loop.shared.views.FeedbackView);
     });
 
+    it("should set the document title to conversation_has_ended when displaying the feedback view", function() {
+      store.setStoreState({callState: CALL_STATES.FINISHED});
+
+      mountTestComponent();
+
+      expect(fakeWindow.document.title).eql("conversation_has_ended");
+    });
+
     it("should play the terminated sound when the call state is 'finished'",
       function() {
         var fakeAudio = {
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 17d9c4243dc..92c0a89e3a7 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -54,6 +54,7 @@ describe("loop.conversation", function() {
     fakeWindow = {
       navigator: { mozLoop: navigator.mozLoop },
       close: sinon.stub(),
+      document: {},
       addEventListener: function() {},
       removeEventListener: function() {}
     };