5 files changed, 5 insertions, 7 deletions
diff --git a/web-ui/app/js/dispatchers/right_pane_dispatcher.js b/web-ui/app/js/dispatchers/right_pane_dispatcher.js
index c342b0b2..870bcd92 100644
--- a/web-ui/app/js/dispatchers/right_pane_dispatcher.js
+++ b/web-ui/app/js/dispatchers/right_pane_dispatcher.js
@@ -104,7 +104,7 @@ define(
         this.on(document, events.dispatchers.rightPane.openComposeBox, this.openComposeBox);
         this.on(document, events.dispatchers.rightPane.openDraft, this.openDraft);
         this.on(document, events.ui.mail.open, this.openMail);
-        this.on(document, events.ui.feedback.open, this.openFeedbackBox);
+        this.on(document, events.dispatchers.rightPane.openFeedbackBox, this.openFeedbackBox);
         this.on(document, events.dispatchers.rightPane.openNoMessageSelected, this.openNoMessageSelectedPane);
         this.on(document, events.dispatchers.rightPane.selectTag, this.selectTag);
         this.on(document, events.ui.tag.selected, this.saveTag);
diff --git a/web-ui/app/js/feedback/feedback_trigger.js b/web-ui/app/js/feedback/feedback_trigger.js
index e98c3e30..598f9060 100644
--- a/web-ui/app/js/feedback/feedback_trigger.js
+++ b/web-ui/app/js/feedback/feedback_trigger.js
@@ -25,7 +25,7 @@ define(['flight/lib/component', 'views/templates', 'page/events', 'features'],
     };
 
     this.onClick = function() {
-      this.trigger(document, events.ui.feedback.open);
+      this.trigger(document, events.dispatchers.rightPane.openFeedbackBox);
     };
 
     this.after('initialize', function () {
diff --git a/web-ui/app/js/mail_view/ui/feedback_box.js b/web-ui/app/js/mail_view/ui/feedback_box.js
index 85c0dadc..1a06b8a3 100644
--- a/web-ui/app/js/mail_view/ui/feedback_box.js
+++ b/web-ui/app/js/mail_view/ui/feedback_box.js
@@ -34,7 +34,7 @@ define(['flight/lib/component', 'views/templates', 'page/events', 'features'],
     this.after('initialize', function () {
       if (features.isEnabled('feedback')) {
           this.render();
-          this.on(document, events.ui.feedback.open, this.openFeedbackBox);
+          this.on(document, events.dispatchers.rightPane.openFeedbackBox, this.openFeedbackBox);
       }
     });
 
diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js
index c00c2848..c54cc6d6 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/app/js/page/events.js
@@ -69,9 +69,6 @@ define(function () {
         next: 'ui:page:next',
         changed: 'ui:page:changed'
       },
-      feedback: {
-        open: 'ui:feedback:open'
-      },
       composeBox: {
         newMessage: 'ui:composeBox:newMessage',
         newReply: 'ui:composeBox:newReply',
@@ -171,6 +168,7 @@ define(function () {
     dispatchers: {
       rightPane: {
         openComposeBox: 'dispatchers:rightPane:openComposeBox',
+        openFeedbackBox: 'dispatchers:rightPane:openFeedbackBox',
         openNoMessageSelected: 'dispatchers:rightPane:openNoMessageSelected',
         openNoMessageSelectedWithoutPushState: 'dispatchers:rightPane:openNoMessageSelectedWithoutPushState',
         refreshMailList: 'dispatchers:rightPane:refreshMailList',
diff --git a/web-ui/app/js/page/pane_contract_expand.js b/web-ui/app/js/page/pane_contract_expand.js
index 771486ae..aee8c44f 100644
--- a/web-ui/app/js/page/pane_contract_expand.js
+++ b/web-ui/app/js/page/pane_contract_expand.js
@@ -42,7 +42,7 @@ define(['flight/lib/component', 'page/events'], function (describeComponent, eve
       this.on(document, events.ui.mail.open, this.contractMiddlePaneExpandRightPane);
       this.on(document, events.dispatchers.rightPane.openComposeBox, this.contractMiddlePaneExpandRightPane);
       this.on(document, events.dispatchers.rightPane.openDraft, this.contractMiddlePaneExpandRightPane);
-      this.on(document, events.ui.feedback.open, this.contractMiddlePaneExpandRightPane);
+      this.on(document, events.dispatchers.rightPane.openFeedbackBox, this.contractMiddlePaneExpandRightPane);
       this.on(document, events.dispatchers.rightPane.openNoMessageSelected, this.expandMiddlePaneContractRightPane);
       this.expandMiddlePaneContractRightPane();
     });