diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java
index 6b312cb88b6761acec362c04c476de2049906b48..a8276f3592c9da453071a4bfb71da63a5e072a5d 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/JobStateComparator.java
@@ -7,20 +7,23 @@ import java.util.Map;
 
 import cz.it4i.fiji.haas_java_client.JobState;
 
-public class JobStateComparator implements Comparator<JobState>{
+public class JobStateComparator implements Comparator<JobState> {
 
-	private static Map<JobState,Integer> priorities = new HashMap<>();
-	private static void  add(JobState state) {
+	private static Map<JobState, Integer> priorities = new HashMap<>();
+
+	private static void add(JobState state) {
 		priorities.put(state, priorities.size());
 	}
-	
+
 	static {
-		Arrays.asList(JobState.Finished,JobState.Queued, JobState.Running, JobState.Canceled, JobState.Failed).forEach(state->add(state));
+		Arrays.asList(JobState.Finished, JobState.Queued, JobState.Running, JobState.Canceled, JobState.Failed, JobState.Unknown)
+				.forEach(state -> add(state));
 	}
+
 	@Override
 	public int compare(JobState o1, JobState o2) {
-		if(!priorities.keySet().containsAll(Arrays.asList(o1, o2))) {
-			throw new IllegalArgumentException();
+		if (!priorities.keySet().containsAll(Arrays.asList(o1, o2))) {
+			throw new IllegalArgumentException("compare: " + o1 + ", " + o2);
 		}
 		return priorities.get(o1) - priorities.get(o2);
 	}
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
index 1c1e842d59ad628abd29ea5161016c47d760e788..17a2429b65e1067afe55265869f85020ba36b037 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
@@ -107,7 +107,7 @@ public class BenchmarkSPIMController extends BorderPane implements CloseableCont
 			job.getValue().startJob(p);
 			job.getValue().update();
 		}), job -> JavaFXRoutines.notNullValue(job, j -> j.getState() == JobState.Configuring
-				|| j.getState() == JobState.Finished || j.getState() == JobState.Failed));
+				|| j.getState() == JobState.Finished || j.getState() == JobState.Failed || j.getState() == JobState.Canceled));
 
 		menu.addItem("Cancel job", job -> executeWSCallAsync("Canceling job", p -> {
 			job.getValue().cancelJob();