diff --git a/core/button_view.js b/core/button_view.js
index a4f70744..2aebf347 100644
--- a/core/button_view.js
+++ b/core/button_view.js
@@ -21,8 +21,7 @@ function ButtonView(options) {
 util.inherits(ButtonView, TextView);
 
 ButtonView.prototype.onKeyPress = function(ch, key) {
-    let actionForKeyName = key ? key.name : ch;
-    if(this.isKeyMapped('accept', actionForKeyName) || ' ' === ch) {
+    if(this.isKeyMapped('accept', (key ? key.name : ch)) || ' ' === ch) {
         this.submitData = 'accept';
         this.emit('action', 'accept');
         delete this.submitData;
diff --git a/core/fse.js b/core/fse.js
index e66d40fe..361bbeff 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -792,7 +792,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                 },
                 function prepareViewStates(callback) {
                     let from = self.viewControllers.header.getView(MciViewIds.header.from);
-                    if (from !== undefined) {
+                    if (from) {
                         from.acceptsFocus = false;
                     }
 
@@ -918,7 +918,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
 
     initHeaderViewMode() {
         // Only set header text for from view if it is on the form
-        if (self.viewControllers.header.getView(MciViewIds.header.from) !== undefined) {
+        if (this.viewControllers.header.getView(MciViewIds.header.from) !== undefined) {
             this.setHeaderText(MciViewIds.header.from, this.message.fromUserName);
         }
         this.setHeaderText(MciViewIds.header.to,            this.message.toUserName);