diff --git a/src/main/java/ui/ModeManager.java b/src/main/java/ui/ModeManager.java
index 5dd1747fba7f56a2366818346e197e90fbd05a67..8e25aa547df19a72176383eaa527299d2639585d 100755
--- a/src/main/java/ui/ModeManager.java
+++ b/src/main/java/ui/ModeManager.java
@@ -139,7 +139,12 @@ public class ModeManager {
             actions[TGUIAction.ACT_GEN_RTLOTOS].setEnabled(true);
             actions[TGUIAction.ACT_GEN_LOTOS].setEnabled(true);
             actions[TGUIAction.ACT_DSE].setEnabled(true);
-            actions[TGUIAction.ACT_GEN_UPPAAL].setEnabled(false);
+            if (mgui.getCurrentTURTLEPanel() instanceof TMLComponentDesignPanel){
+           		actions[TGUIAction.ACT_GEN_UPPAAL].setEnabled(true);
+            }
+            else {
+	            actions[TGUIAction.ACT_GEN_UPPAAL].setEnabled(false);
+	        }
             actions[TGUIAction.ACT_GEN_JAVA].setEnabled(true);
             actions[TGUIAction.ACT_SIMU_JAVA].setEnabled(true);
             actions[TGUIAction.ACT_GEN_RTLOTOS].setEnabled(true);