diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java
index 7ebafff..d8426ae 100644
--- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java
+++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java
@@ -176,6 +176,8 @@ public class ComputationParametersPanel extends SimpleContainer {
 			@Override
 			public void onSelect(SelectEvent event) {
 				if (handler != null && parametersPanel.isValid()) {
+					submit.disable();
+					Log.info("Computation Submitted!");
 					handler.startComputation(); // TODO insert
 												// description
 				}
@@ -295,6 +297,7 @@ public class ComputationParametersPanel extends SimpleContainer {
 			parametersPanel.getElement().getStyle()
 					.setPaddingBottom(0, Unit.PX);
 			submit.setVisible(true);
+			submit.enable();
 			parametersPanel.forceLayout();
 			forceLayout();