diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index cd76c935522e..e98c7dfcb26d 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -921,12 +921,17 @@ loop.panel = (function(_, mozL10n) {
       window.removeEventListener("GettingStartedSeen", this._gettingStartedSeen);
     },
 
+    handleContextMenu: function(e) {
+      e.preventDefault();
+    },
+
     render: function() {
       var NotificationListView = sharedViews.NotificationListView;
 
       if (!this.state.gettingStartedSeen) {
         return (
-          React.createElement("div", {className: "fte-get-started-container"}, 
+          React.createElement("div", {className: "fte-get-started-container", 
+               onContextMenu: this.handleContextMenu}, 
             React.createElement(NotificationListView, {
               clearOnDocumentHidden: true, 
               notifications: this.props.notifications}), 
@@ -941,7 +946,8 @@ loop.panel = (function(_, mozL10n) {
       }
 
       return (
-        React.createElement("div", {className: "panel-content"}, 
+        React.createElement("div", {className: "panel-content", 
+             onContextMenu: this.handleContextMenu}, 
           React.createElement("div", {className: "beta-ribbon"}), 
           React.createElement(NotificationListView, {
             clearOnDocumentHidden: true, 
diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx
index 5c4755023897..a0821b918611 100644
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -921,12 +921,17 @@ loop.panel = (function(_, mozL10n) {
       window.removeEventListener("GettingStartedSeen", this._gettingStartedSeen);
     },
 
+    handleContextMenu: function(e) {
+      e.preventDefault();
+    },
+
     render: function() {
       var NotificationListView = sharedViews.NotificationListView;
 
       if (!this.state.gettingStartedSeen) {
         return (
-          <div className="fte-get-started-container">
+          <div className="fte-get-started-container"
+               onContextMenu={this.handleContextMenu}>
             <NotificationListView
               clearOnDocumentHidden={true}
               notifications={this.props.notifications} />
@@ -941,7 +946,8 @@ loop.panel = (function(_, mozL10n) {
       }
 
       return (
-        <div className="panel-content">
+        <div className="panel-content"
+             onContextMenu={this.handleContextMenu} >
           <div className="beta-ribbon" />
           <NotificationListView
             clearOnDocumentHidden={true}
diff --git a/browser/components/loop/content/js/roomViews.js b/browser/components/loop/content/js/roomViews.js
index 350e2d15aa62..ebe91b58cf50 100644
--- a/browser/components/loop/content/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -762,6 +762,10 @@ loop.roomViews = (function(mozL10n) {
       }
     },
 
+    handleContextMenu: function(e) {
+      e.preventDefault();
+    },
+
     render: function() {
       if (this.state.roomName || this.state.roomContextUrls) {
         var roomTitle = this.state.roomName ||
@@ -807,7 +811,8 @@ loop.roomViews = (function(mozL10n) {
             { id: "help" }
           ];
           return (
-            React.createElement("div", {className: "room-conversation-wrapper desktop-room-wrapper"}, 
+            React.createElement("div", {className: "room-conversation-wrapper desktop-room-wrapper", 
+              onContextMenu: this.handleContextMenu}, 
               React.createElement(sharedViews.MediaLayoutView, {
                 dispatcher: this.props.dispatcher, 
                 displayScreenShare: false, 
diff --git a/browser/components/loop/content/js/roomViews.jsx b/browser/components/loop/content/js/roomViews.jsx
index 63b2c4f4d757..a8349efc58fd 100644
--- a/browser/components/loop/content/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -762,6 +762,10 @@ loop.roomViews = (function(mozL10n) {
       }
     },
 
+    handleContextMenu: function(e) {
+      e.preventDefault();
+    },
+
     render: function() {
       if (this.state.roomName || this.state.roomContextUrls) {
         var roomTitle = this.state.roomName ||
@@ -807,7 +811,8 @@ loop.roomViews = (function(mozL10n) {
             { id: "help" }
           ];
           return (
-            <div className="room-conversation-wrapper desktop-room-wrapper">
+            <div className="room-conversation-wrapper desktop-room-wrapper"
+              onContextMenu={this.handleContextMenu}>
               <sharedViews.MediaLayoutView
                 dispatcher={this.props.dispatcher}
                 displayScreenShare={false}
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 5ae5e0a02ce8..4bb9d449e1c7 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -218,6 +218,16 @@ describe("loop.panel", function() {
         navigator.mozLoop.fxAEnabled = true;
       });
 
+      it("should NOT show the context menu on right click", function() {
+        var prevent = sandbox.stub();
+        var view = createTestPanelView();
+        TestUtils.Simulate.contextMenu(
+          view.getDOMNode(),
+          { preventDefault: prevent }
+        );
+        sinon.assert.calledOnce(prevent);
+      });
+
       it("should trigger the FxA sign in/up process when clicking the link",
         function() {
           navigator.mozLoop.logInToFxA = sandbox.stub();
diff --git a/browser/components/loop/test/desktop-local/roomViews_test.js b/browser/components/loop/test/desktop-local/roomViews_test.js
index cc09d31f3945..423ffd8762a1 100644
--- a/browser/components/loop/test/desktop-local/roomViews_test.js
+++ b/browser/components/loop/test/desktop-local/roomViews_test.js
@@ -342,6 +342,16 @@ describe("loop.roomViews", function() {
         React.createElement(loop.roomViews.DesktopRoomConversationView, props));
     }
 
+    it("should NOT show the context menu on right click", function() {
+      var prevent = sandbox.stub();
+      view = mountTestComponent();
+      TestUtils.Simulate.contextMenu(
+        view.getDOMNode(),
+        { preventDefault: prevent }
+      );
+      sinon.assert.calledOnce(prevent);
+    });
+
     it("should dispatch a setMute action when the audio mute button is pressed",
       function() {
         view = mountTestComponent();
@@ -690,7 +700,6 @@ describe("loop.roomViews", function() {
           expect(fakeWindow.document.title).to.equal("https://fakeurl.com");
         });
       });
-
     });
 
     describe("Edit Context", function() {