diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index c8dd2a98d..07b400580 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1116,11 +1116,21 @@ export class Message extends React.PureComponent<Props, State> {
               expiring ? 'module-message--expired' : null
             )}
             role="button"
-            onClick={() => {
+            onClick={e => {
               const selection = window.getSelection();
+              // Text is being selected
               if (selection && selection.type === 'Range') {
                 return;
               }
+
+              // User clicked on message body
+              // if (e.target === 'span.text-selectable'){
+
+              // }
+              console.log(`[event] EVENT: `, e);
+              console.log(`[event] Target: `, e.target);
+              console.log(`[event] Tagname: `, e.target);
+
               this.props.onSelectMessage();
             }}
           >
diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx
index de9119337..67e34231b 100644
--- a/ts/components/session/SessionClosableOverlay.tsx
+++ b/ts/components/session/SessionClosableOverlay.tsx
@@ -176,9 +176,8 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
               value={this.state.groupName}
               maxLength={window.CONSTANTS.MAX_GROUPNAME_LENGTH}
               onChange={this.onGroupNameChanged}
+              onPressEnter={onButtonClick ?? onButtonClick()}
             />
-
-            {/*  */}
           </div>
         ) : (
           <SessionIdEditable
@@ -286,4 +285,5 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
       groupName: event,
     });
   }
+
 }
diff --git a/ts/components/session/SessionIdEditable.tsx b/ts/components/session/SessionIdEditable.tsx
index cf2f8da9d..dc4bab8bc 100644
--- a/ts/components/session/SessionIdEditable.tsx
+++ b/ts/components/session/SessionIdEditable.tsx
@@ -61,7 +61,7 @@ export class SessionIdEditable extends React.PureComponent<Props> {
 
   private handleKeyDown(e: any) {
     const { editable, onPressEnter } = this.props;
-    if (editable && e.keyCode === 13) {
+    if (editable && e.key === 'Enter') {
       e.preventDefault();
       // tslint:disable-next-line: no-unused-expression
       onPressEnter && onPressEnter();