diff --git a/ivette/src/frama-c/plugins/eva/components/Tools.tsx b/ivette/src/frama-c/plugins/eva/components/Tools.tsx
index 01d9340ce68f8d7fcae65ae981a394db46d49383..078a7fa2bbc4f24c81083553cc1a3e4ae4193d56 100644
--- a/ivette/src/frama-c/plugins/eva/components/Tools.tsx
+++ b/ivette/src/frama-c/plugins/eva/components/Tools.tsx
@@ -44,7 +44,17 @@ export default function EvaTools(
   const countErrors = remote.getErrors();
   remote.resetNotified();
 
-  const compute = (): void => { Server.send(Eva.compute, null); };
+  const startAnalysis = () => {
+    setTimeout(() => {
+      if(!remote.hasReset()) Server.send(Eva.compute, null);
+      else startAnalysis();
+    }, 150);
+  }
+
+  const compute = (): void => {
+    if(remote.hasReset()) remote.commit();
+    startAnalysis();
+  };
   const abort = (): void => { Server.send(Eva.abort, null); };
   const syncFromFC = (): void => { remote.reset(); };
   const syncToFC = (): void => { remote.commit(); };
@@ -54,9 +64,9 @@ export default function EvaTools(
       <Hbox className='eva-tools-actions'>
         <IconButton
           icon="MEDIA.PLAY"
-          title="Launch Eva analysis"
+          title="Commit changes and launch Eva analysis"
           size={iconSize}
-          disabled={evaComputed !== "not_computed"}
+          disabled={evaComputed === "computing"}
           onClick={compute}
         />
         <IconButton