diff --git a/src/main/java/common/SpecConfigTTool.java b/src/main/java/common/SpecConfigTTool.java
index 204bb585db2f7c546028f5243e86fd2744ff02f1..25d5c81c026d813d9da4b75db9c9306361329d69 100644
--- a/src/main/java/common/SpecConfigTTool.java
+++ b/src/main/java/common/SpecConfigTTool.java
@@ -16,6 +16,13 @@ import myutil.FileUtils;
 import myutil.MalformedConfigurationException;
 import myutil.TraceManager;
 
+/**
+ * Specific configuration for ttool project
+ * Creation: 13/10/2017
+ * @version 1.0
+ * @author Fabien Tessier
+ *
+ */
 public class SpecConfigTTool {
 	public static String SystemCCodeDirectory="";
 	public static String SystemCCodeCompileCommand="";
@@ -117,7 +124,6 @@ public class SpecConfigTTool {
 	        }
 
 	        loadConfigurationFromXML(data);
-	        SpecConfigTTool.loadConfiguration();
 	    }
 	 
 	 public static void loadConfigurationFromXML(String data) throws MalformedConfigurationException {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 3d960a124e2c581a6218d8d6d80601990967259b..e9605270f14ebfad0051632e29a80c9d34bdf922 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -2537,6 +2537,13 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         gtm.enableUndo(true);
         gtm.saveOperation(getCurrentSelectedPoint());
         dtree.forceUpdate();
+        if (SpecConfigTTool.lastTab > -1 && SpecConfigTTool.lastPanel > -1) {
+        	this.mainTabbedPane.setSelectedIndex(SpecConfigTTool.lastTab);
+        	activetdp = tabs.get(SpecConfigTTool.lastTab).getPanels().elementAt(SpecConfigTTool.lastPanel);
+        	activetdp.selectTab(activetdp.name);
+        }
+        this.basicActivateDrawing();
+        
     }
 
     public void saveAsLibrary(String data) {