diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21f602ce72..e20c72202f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed Stock logic not working with manage_stock set to false - @andrzejewsky - (#3957)
 - Support old price format in `ProductPrice` - @gibkigonzo (#3978)
 - Fixed product bundle comparison condition - @gk-daniel (#4004)
+- Fixed `Processing order...` modal closing too early - @grimasod (#4021)
 - Keep registered payment methods after `syncTotals`  - @grimasod (#4020)
 - Added status code to the cache content and use it in cache response - @resubaka (#4014)
 
diff --git a/core/modules/order/store/actions.ts b/core/modules/order/store/actions.ts
index 145483c48c..b680cda15b 100644
--- a/core/modules/order/store/actions.ts
+++ b/core/modules/order/store/actions.ts
@@ -53,7 +53,6 @@ const actions: ActionTree<OrderState, RootState> = {
   async processOrder ({ commit, dispatch }, { newOrder, currentOrderHash }) {
     const order = { ...newOrder, transmited: true }
     const task = await OrderService.placeOrder(order)
-    EventBus.$emit('notification-progress-stop')
 
     if (task.resultCode === 200) {
       dispatch('enqueueOrder', { newOrder: order })
@@ -61,7 +60,7 @@ const actions: ActionTree<OrderState, RootState> = {
       commit(types.ORDER_LAST_ORDER_WITH_CONFIRMATION, { order, confirmation: task.result })
       orderHooksExecutors.afterPlaceOrder({ order, task })
       EventBus.$emit('order-after-placed', { order, confirmation: task.result })
-
+      EventBus.$emit('notification-progress-stop')
       return task
     }
 
@@ -71,10 +70,10 @@ const actions: ActionTree<OrderState, RootState> = {
       Logger.error('Internal validation error; Order entity is not compliant with the schema: ' + JSON.stringify(task.result), 'orders')()
       dispatch('notification/spawnNotification', notifications.internalValidationError(), { root: true })
       dispatch('enqueueOrder', { newOrder: order })
-
+      EventBus.$emit('notification-progress-stop')
       return task
     }
-
+    EventBus.$emit('notification-progress-stop')
     throw new Error('Unhandled place order request error')
   },
   handlePlacingOrderFailed ({ commit, dispatch }, { newOrder, currentOrderHash }) {