diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js
index 9dace75bec03..07059a92c5ed 100644
--- a/src/components/ContextMenuItem.js
+++ b/src/components/ContextMenuItem.js
@@ -55,10 +55,9 @@ class ContextMenuItem extends Component {
      * Method to call parent onPress and toggleDelayButtonState
      */
     triggerPressAndUpdateSuccess() {
-        if (this.props.isDelayButtonStateComplete) {
-            return;
+        if (!this.props.isDelayButtonStateComplete) {
+            this.props.onPress();
         }
-        this.props.onPress();
 
         // We only set the success state when we have icon or text to represent the success state
         // We may want to replace this check by checking the Result from OnPress Callback in future.
diff --git a/src/components/withDelayToggleButtonState.js b/src/components/withDelayToggleButtonState.js
index c312d18fba74..9ba0452d1ea5 100644
--- a/src/components/withDelayToggleButtonState.js
+++ b/src/components/withDelayToggleButtonState.js
@@ -41,6 +41,11 @@ export default function (WrappedComponent) {
                 return;
             }
 
+            // Clear existing timer
+            if (this.resetButtonStateCompleteTimer) {
+                clearTimeout(this.resetButtonStateCompleteTimer);
+            }
+
             this.resetButtonStateCompleteTimer = setTimeout(() => {
                 this.setState({
                     isDelayButtonStateComplete: false,