diff --git a/src/org/zaproxy/zap/view/ScanPanel.java b/src/org/zaproxy/zap/view/ScanPanel.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/view/ScanPanel.java
+++ b/src/org/zaproxy/zap/view/ScanPanel.java
@@ -757,7 +757,7 @@ public abstract class ScanPanel extends AbstractPanel {
         	scanFinshedEventHandler(host);

 	    } else {

 	        try {

-	            EventQueue.invokeAndWait(new Runnable() {

+	            EventQueue.invokeLater(new Runnable() {

 	                @Override

 	                public void run() {

 	                	scanFinshedEventHandler(host);

diff --git a/src/org/zaproxy/zap/view/ScanPanel2.java b/src/org/zaproxy/zap/view/ScanPanel2.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/view/ScanPanel2.java
+++ b/src/org/zaproxy/zap/view/ScanPanel2.java
@@ -458,7 +458,7 @@ public abstract class ScanPanel2<GS extends GenericScanner2, SC extends ScanCont
         	scanFinshedEventHandler(id, host);

 	    } else {

 	        try {

-	            EventQueue.invokeAndWait(new Runnable() {

+	            EventQueue.invokeLater(new Runnable() {

 	                @Override

 	                public void run() {

 	                	scanFinshedEventHandler(id, host);
Fixes #<I> Stop Attack Feature Locks up ZAP