diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project
index f4fb70634..a9f3b068a 100644
--- a/app/src/gambas3/.project
+++ b/app/src/gambas3/.project
@@ -33,7 +33,6 @@ Description="Integrated Development Environment for Gambas"
 Authors="Benoît Minisini\nFabien Bodard\nCharlie Reinl\nJosé Luis Redrejo\nRobert Rowe\nTobias Boege"
 Arguments=[["-t","/home/benoit/gambas/git/master/app/src/gambas3"],["--help"]]
 CurrentArgument=0
-Environment="GB_JIT_DEBUG=1"
 TabSize=2
 Translate=1
 Language=en
diff --git a/app/src/gambas3/.src/Debug/FDebugButton.class b/app/src/gambas3/.src/Debug/FDebugButton.class
index 370889f7a..abe17efec 100644
--- a/app/src/gambas3/.src/Debug/FDebugButton.class
+++ b/app/src/gambas3/.src/Debug/FDebugButton.class
@@ -1,5 +1,7 @@
 ' Gambas class file
 
+Private $bNoSelectButton As Boolean
+
 Public Sub ReadConfig()
   
   Project.SetSmallFont(Me)
@@ -61,8 +63,12 @@ End
 Public Sub SelectButton(iTab As Integer)
 
   Dim hButton As ToolButton = Me.Children[iTab]
-  If hButton.Value Then Return
-  hButton.Value = True
+  
+  If $bNoSelectButton Then Return
+  
+  $bNoSelectButton = True
+  If Not hButton.Value Then hButton.Value = True
+  $bNoSelectButton = False
   
 End
 
diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class
index 1ab15ec14..76097573e 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.class
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.class
@@ -1436,6 +1436,7 @@ End
 
 Public Sub InsertVersionControl(sText As String)
   
+  If FMain.IsDebugVisible() Then FDebugButton.SelectButton(TAB_VERSION_CONTROL)
   trmVersionControl.Print(Replace(sText, "\n", "\r\n"))
   
 End
diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.form b/app/src/gambas3/.src/Debug/FDebugInfo.form
index 60191d774..a7519224d 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.form
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.form
@@ -89,7 +89,7 @@
     Index = 1
     Text = ("Console")
     { panConsole Panel
-      MoveScaled(5,4,24,24)
+      MoveScaled(1,1,113,24)
       Expand = True
       Arrangement = Arrange.Fill
     }
diff --git a/app/src/gambas3/.src/FMain.class b/app/src/gambas3/.src/FMain.class
index 09822cf03..3f2c57be1 100644
--- a/app/src/gambas3/.src/FMain.class
+++ b/app/src/gambas3/.src/FMain.class
@@ -27,8 +27,11 @@ Private $hBorderE As Image
 
 Private $iTabBarHeight As Integer
 
+Private $bFirstShowDebug As Boolean
+
 Static Private $sCompressMessage As String
 
+
 Public Sub _new()
   
   'Me.ResizeScaled(86, 97)
@@ -1356,11 +1359,15 @@ End
 
 Public Sub ShowDebug(bShow As Boolean, Optional bAutomatic As Boolean)
 
-   If bAutomatic Then
+  If bAutomatic Then
     If Not Settings["/ShowDebugPanelAutomatically", True] Then Return
   Endif
   
   panDebug.Hidden = Not bShow
+  If bShow And If Me.Visible And If Not $bFirstShowDebug Then
+    Wait 0.05
+    $bFirstShowDebug = True
+  Endif
   
 End
 
diff --git a/app/src/gambas3/.src/FMain.form b/app/src/gambas3/.src/FMain.form
index 979779f92..bbb32d94f 100644
--- a/app/src/gambas3/.src/FMain.form
+++ b/app/src/gambas3/.src/FMain.form
@@ -1304,13 +1304,6 @@
               MoveScaled(86,8,0,9)
               Visible = False
             }
-            { btnWorkspaceProperty ToolButton
-              MoveScaled(27,1,4,4)
-              Visible = False
-              ToolTip = ("Show properties sheet")
-              Ignore = True
-              Picture = Picture["icon:/small/properties"]
-            }
             { btnWorkspaceProject ToolButton
               MoveScaled(22,1,4,4)
               Visible = False
@@ -1318,6 +1311,13 @@
               Ignore = True
               Picture = Picture["icon:/small/view-tree"]
             }
+            { btnWorkspaceProperty ToolButton
+              MoveScaled(27,1,4,4)
+              Visible = False
+              ToolTip = ("Show properties sheet")
+              Ignore = True
+              Picture = Picture["icon:/small/properties"]
+            }
           }
           { panDebug SidePanel
             MoveScaled(3,37,81,14)
@@ -1372,13 +1372,6 @@
               Text = ("Hierarchy")
               Index = 0
             }
-            { btnPropertyHelp ToolButton
-              MoveScaled(4,0,4,4)
-              Visible = False
-              ToolTip = ("Show property help")
-              Ignore = True
-              Picture = Picture["icon:/small/help"]
-            }
             { btnPropertyToolbar ToolButton
               MoveScaled(0,0,4,4)
               Visible = False
@@ -1386,6 +1379,13 @@
               Ignore = True
               Picture = Picture["img/16/control.png"]
             }
+            { btnPropertyHelp ToolButton
+              MoveScaled(4,0,4,4)
+              Visible = False
+              ToolTip = ("Show property help")
+              Ignore = True
+              Picture = Picture["icon:/small/help"]
+            }
           }
           { panTool SidePanel
             MoveScaled(5,49,21,37)
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index 48361935b..59063faae 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -2985,6 +2985,9 @@ Public Function MakeExecutable(Optional bDoNotIncVersion As Boolean, Optional bS
   Dim bOK As Boolean
   Dim sErr As String
   Dim bSaveDone As Boolean
+  Dim hProcess As Process
+  Dim hTerminal As TerminalView
+  Dim sCommand As String
 
   If CheckStartupClass() Then Return True
 
@@ -3047,7 +3050,13 @@ Public Function MakeExecutable(Optional bDoNotIncVersion As Boolean, Optional bS
     Endif
 
     If RunAfterMakingExec Then
-      Shell Replace(RunAfterMakingExec, "$(FILE)", Shell$(sExecPath)) Wait
+      'Shell Replace(RunAfterMakingExec, "$(FILE)", Shell$(sExecPath)) Wait
+      FDebugInfo.ShowConsole()
+      hTerminal = FOutput.GetTerminal() 
+      sCommand = Replace(RunAfterMakingExec, "$(FILE)", Shell$(sExecPath))
+      hTerminal.Print(sCommand & "\r\n")
+      hProcess = hTerminal.Shell(sCommand)
+      hProcess.Wait
     Endif
 
     UpdateTitle