diff --git a/src/components/ConfirmDialog.react.js b/src/components/ConfirmDialog.react.js
index afc2e9116..e19fec391 100644
--- a/src/components/ConfirmDialog.react.js
+++ b/src/components/ConfirmDialog.react.js
@@ -10,39 +10,30 @@ import {Component} from 'react';
 export default class ConfirmDialog extends Component {
     constructor(props) {
         super(props);
-        this.state = {
-            displayed: props.displayed,
-        };
     }
 
-    _setStateAndProps(value) {
-        const {setProps} = this.props;
-        this.setState({displayed: value.displayed});
-        if (setProps) {
-            setProps(value);
-        }
+    componentDidUpdate(prevProps) {
+        this._update(!prevProps.displayed && this.props.displayed);
     }
 
-    componentWillReceiveProps(props) {
-        this.setState({displayed: props.displayed});
+    componentDidMount() {
+        this._update(this.props.displayed);
     }
 
-    _update() {
-        const {message, cancel_n_clicks, submit_n_clicks} = this.props;
+    _update(shouldTriggerDisplay) {
+        const {message, setProps, cancel_n_clicks, submit_n_clicks} = this.props;
 
-        const displayed = this.state.displayed;
-
-        if (displayed) {
+        if (shouldTriggerDisplay) {
             new Promise(resolve => resolve(window.confirm(message))).then(
                 result => {
                     if (result) {
-                        this._setStateAndProps({
+                        setProps({
                             submit_n_clicks: submit_n_clicks + 1,
                             submit_n_clicks_timestamp: Date.now(),
                             displayed: false,
                         });
                     } else {
-                        this._setStateAndProps({
+                        setProps({
                             cancel_n_clicks: cancel_n_clicks + 1,
                             cancel_n_clicks_timestamp: Date.now(),
                             displayed: false,
@@ -53,14 +44,6 @@ export default class ConfirmDialog extends Component {
         }
     }
 
-    componentDidUpdate() {
-        this._update();
-    }
-
-    componentDidMount() {
-        this._update();
-    }
-
     render() {
         return null;
     }