4 files changed, 9 insertions, 6 deletions
diff --git a/web-ui/app/js/dispatchers/right_pane_dispatcher.js b/web-ui/app/js/dispatchers/right_pane_dispatcher.js
index 47339e7d..c342b0b2 100644
--- a/web-ui/app/js/dispatchers/right_pane_dispatcher.js
+++ b/web-ui/app/js/dispatchers/right_pane_dispatcher.js
@@ -23,7 +23,7 @@ define(
     'mail_view/ui/reply_section',
     'mail_view/ui/draft_box',
     'mail_view/ui/no_message_selected_pane',
-    'mail_view/ui/compose_feedback',
+    'mail_view/ui/feedback_box',
     'page/events'
   ],
 
diff --git a/web-ui/app/js/mail_view/ui/compose_feedback.js b/web-ui/app/js/mail_view/ui/feedback_box.js
index 4d506864..85c0dadc 100644
--- a/web-ui/app/js/mail_view/ui/compose_feedback.js
+++ b/web-ui/app/js/mail_view/ui/feedback_box.js
@@ -24,15 +24,17 @@ define(['flight/lib/component', 'views/templates', 'page/events', 'features'],
       this.$node.html(templates.compose.feedback());
     };
 
-    this.openComposeBox = function() {
-      var stage = this.reset('compose-box');
+    this.openFeedbackBox = function() {
+      var stage = this.reset('feedback-box');
       this.attachTo(stage);
+      this.enableFloatlabel('input.floatlabel');
+      this.enableFloatlabel('textarea.floatlabel');
     };
 
     this.after('initialize', function () {
       if (features.isEnabled('feedback')) {
           this.render();
-          this.on(document, events.ui.feedback.open, this.openComposeBox);
+          this.on(document, events.ui.feedback.open, this.openFeedbackBox);
       }
     });
 
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index 83bd975f..37eabaec 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -44,7 +44,7 @@ define(
     'page/logout',
     'page/logout_shortcut',
     'feedback/feedback_trigger',
-    'mail_view/ui/compose_feedback',
+    'mail_view/ui/feedback_box',
     'page/version',
   ],
 
@@ -77,7 +77,7 @@ define(
     logout,
     logoutShortcut,
     feedback,
-    compose_feedback,
+    feedbackBox,
     version) {
 
     'use strict';
diff --git a/web-ui/app/js/page/pane_contract_expand.js b/web-ui/app/js/page/pane_contract_expand.js
index 153e38e5..771486ae 100644
--- a/web-ui/app/js/page/pane_contract_expand.js
+++ b/web-ui/app/js/page/pane_contract_expand.js
@@ -42,6 +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.openNoMessageSelected, this.expandMiddlePaneContractRightPane);
       this.expandMiddlePaneContractRightPane();
     });