diff --git a/js/views/session_confirm_view.js b/js/views/session_confirm_view.js
index f5be20610..ae31cec29 100644
--- a/js/views/session_confirm_view.js
+++ b/js/views/session_confirm_view.js
@@ -26,12 +26,10 @@
 
     registerEvents() {
       this.unregisterEvents();
-      document.addEventListener('mousedown', this.props.onClickClose, false);
       document.addEventListener('keyup', this.props.onClickClose, false);
     },
 
     unregisterEvents() {
-      document.removeEventListener('mousedown', this.props.onClickClose, false);
       document.removeEventListener('keyup', this.props.onClickClose, false);
     },
 
diff --git a/ts/components/ConfirmDialog.tsx b/ts/components/ConfirmDialog.tsx
index 77f902680..78c02f62f 100644
--- a/ts/components/ConfirmDialog.tsx
+++ b/ts/components/ConfirmDialog.tsx
@@ -21,7 +21,7 @@ export class ConfirmDialog extends React.Component<Props> {
     return (
       <SessionModal
         title={this.props.titleText}
-        onClose={() => null}
+        onClose={this.props.onClose}
         onOk={() => null}
       >
         <div className="spacer-md" />
diff --git a/ts/components/conversation/CreateGroupDialog.tsx b/ts/components/conversation/CreateGroupDialog.tsx
index 57ce634c9..ce853d4ce 100644
--- a/ts/components/conversation/CreateGroupDialog.tsx
+++ b/ts/components/conversation/CreateGroupDialog.tsx
@@ -95,7 +95,7 @@ export class CreateGroupDialog extends React.Component<Props, State> {
     );
 
     return (
-      <SessionModal title={titleText} onClose={() => null} onOk={() => null}>
+      <SessionModal title={titleText} onClose={this.closeDialog} onOk={() => null}>
         <div className="spacer-lg" />
 
         <p className={errorMessageClasses}>{this.state.errorMessage}</p>
diff --git a/ts/components/session/SessionConfirm.tsx b/ts/components/session/SessionConfirm.tsx
index 561f2127e..1e3595499 100644
--- a/ts/components/session/SessionConfirm.tsx
+++ b/ts/components/session/SessionConfirm.tsx
@@ -53,7 +53,7 @@ export class SessionConfirm extends React.Component<Props> {
     return (
       <SessionModal
         title={title}
-        onClose={() => null}
+        onClose={onClickClose}
         onOk={() => null}
         showExitIcon={false}
         showHeader={showHeader}
diff --git a/ts/components/session/SessionModal.tsx b/ts/components/session/SessionModal.tsx
index d4345fb76..7fd8f559c 100644
--- a/ts/components/session/SessionModal.tsx
+++ b/ts/components/session/SessionModal.tsx
@@ -51,7 +51,7 @@ export class SessionModal extends React.PureComponent<Props, State> {
     window.addEventListener('keyup', this.onKeyUp);
   }
 
-  public componentWillMount() {
+  public componentDidMount() {
     document.addEventListener('mousedown', this.handleClick, false);
   }
 
@@ -127,6 +127,7 @@ export class SessionModal extends React.PureComponent<Props, State> {
     });
 
     window.removeEventListener('keyup', this.onKeyUp);
+    document.removeEventListener('mousedown', this.handleClick, false);
 
     if (this.props.onClose) {
       this.props.onClose();