diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
index 8aae695..9ede904 100644
--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
@@ -179,9 +179,10 @@ void KisToolSmartPatch::endPrimaryAction(KoPointerEvent *event)
                              KisStrokeJobData::BARRIER, KisStrokeJobData::EXCLUSIVE );
 
     applicator.end();
-    image()->waitForDone();
-
     QApplication::restoreOverrideCursor();
+
+    blockUntilOperationsFinishedForced();
+
     m_d->maskDev->clear();
 }