diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
index 37f0d92..980af48 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
@@ -147,8 +147,12 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
             return true;
         }
         else if (id == R.id.action_edit) {
-            Intent intent = new Intent(this, EditActivity.class);
-            startActivity(intent);
+            if(!currentExecutor.isRunning()) {
+                Intent intent = new Intent(this, EditActivity.class);
+                startActivity(intent);
+            }
+            else
+                Toast.makeText(this, "Stop execution to edit behaviours", Toast.LENGTH_SHORT).show();
             return true;
         }
         else if (id == R.id.action_settings) {