diff --git a/EdiabasLib/EdiabasLibConfigTool/FormMain.Designer.cs b/EdiabasLib/EdiabasLibConfigTool/FormMain.Designer.cs
index 2ff5c9188..ee16d66a4 100644
--- a/EdiabasLib/EdiabasLibConfigTool/FormMain.Designer.cs
+++ b/EdiabasLib/EdiabasLibConfigTool/FormMain.Designer.cs
@@ -245,6 +245,7 @@ private void InitializeComponent()
             resources.ApplyResources(this.textBoxIstaLocation, "textBoxIstaLocation");
             this.textBoxIstaLocation.Name = "textBoxIstaLocation";
             this.textBoxIstaLocation.ReadOnly = true;
+            this.textBoxIstaLocation.TabStop = false;
             // 
             // FormMain
             // 
diff --git a/EdiabasLib/EdiabasLibConfigTool/FormMain.resx b/EdiabasLib/EdiabasLibConfigTool/FormMain.resx
index ddf73a50d..6df28bbef 100644
--- a/EdiabasLib/EdiabasLibConfigTool/FormMain.resx
+++ b/EdiabasLib/EdiabasLibConfigTool/FormMain.resx
@@ -597,6 +597,15 @@
   <data name="&gt;&gt;buttonRestoreVasPc.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="textBoxIstaLocation.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 19</value>
+  </data>
+  <data name="textBoxIstaLocation.Size" type="System.Drawing.Size, System.Drawing">
+    <value>430, 20</value>
+  </data>
+  <data name="textBoxIstaLocation.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;textBoxIstaLocation.Name" xml:space="preserve">
     <value>textBoxIstaLocation</value>
   </data>
@@ -609,66 +618,6 @@
   <data name="&gt;&gt;textBoxIstaLocation.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;buttonDirIstad.Name" xml:space="preserve">
-    <value>buttonDirIstad</value>
-  </data>
-  <data name="&gt;&gt;buttonDirIstad.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;buttonDirIstad.Parent" xml:space="preserve">
-    <value>groupBoxIstad</value>
-  </data>
-  <data name="&gt;&gt;buttonDirIstad.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;buttonPatchIstad.Name" xml:space="preserve">
-    <value>buttonPatchIstad</value>
-  </data>
-  <data name="&gt;&gt;buttonPatchIstad.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;buttonPatchIstad.Parent" xml:space="preserve">
-    <value>groupBoxIstad</value>
-  </data>
-  <data name="&gt;&gt;buttonPatchIstad.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;buttonRestoreIstad.Name" xml:space="preserve">
-    <value>buttonRestoreIstad</value>
-  </data>
-  <data name="&gt;&gt;buttonRestoreIstad.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;buttonRestoreIstad.Parent" xml:space="preserve">
-    <value>groupBoxIstad</value>
-  </data>
-  <data name="&gt;&gt;buttonRestoreIstad.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="groupBoxIstad.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 523</value>
-  </data>
-  <data name="groupBoxIstad.Size" type="System.Drawing.Size, System.Drawing">
-    <value>442, 74</value>
-  </data>
-  <data name="groupBoxIstad.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="groupBoxIstad.Text" xml:space="preserve">
-    <value>ISTA-D</value>
-  </data>
-  <data name="&gt;&gt;groupBoxIstad.Name" xml:space="preserve">
-    <value>groupBoxIstad</value>
-  </data>
-  <data name="&gt;&gt;groupBoxIstad.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBoxIstad.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;groupBoxIstad.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="buttonDirIstad.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -679,7 +628,7 @@
     <value>156, 23</value>
   </data>
   <data name="buttonDirIstad.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="buttonDirIstad.Text" xml:space="preserve">
     <value>Select Location</value>
@@ -706,7 +655,7 @@
     <value>100, 23</value>
   </data>
   <data name="buttonPatchIstad.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="buttonPatchIstad.Text" xml:space="preserve">
     <value>Patch</value>
@@ -733,7 +682,7 @@
     <value>100, 23</value>
   </data>
   <data name="buttonRestoreIstad.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="buttonRestoreIstad.Text" xml:space="preserve">
     <value>Restore</value>
@@ -750,6 +699,30 @@
   <data name="&gt;&gt;buttonRestoreIstad.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="groupBoxIstad.Location" type="System.Drawing.Point, System.Drawing">
+    <value>14, 523</value>
+  </data>
+  <data name="groupBoxIstad.Size" type="System.Drawing.Size, System.Drawing">
+    <value>442, 74</value>
+  </data>
+  <data name="groupBoxIstad.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="groupBoxIstad.Text" xml:space="preserve">
+    <value>ISTA-D</value>
+  </data>
+  <data name="&gt;&gt;groupBoxIstad.Name" xml:space="preserve">
+    <value>groupBoxIstad</value>
+  </data>
+  <data name="&gt;&gt;groupBoxIstad.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBoxIstad.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBoxIstad.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="comboBoxLanguage.Location" type="System.Drawing.Point, System.Drawing">
     <value>437, 12</value>
   </data>
@@ -801,27 +774,6 @@
   <data name="&gt;&gt;labelLanguage.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="textBoxIstaLocation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 19</value>
-  </data>
-  <data name="textBoxIstaLocation.Size" type="System.Drawing.Size, System.Drawing">
-    <value>430, 20</value>
-  </data>
-  <data name="textBoxIstaLocation.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;textBoxIstaLocation.Name" xml:space="preserve">
-    <value>textBoxIstaLocation</value>
-  </data>
-  <data name="&gt;&gt;textBoxIstaLocation.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;textBoxIstaLocation.Parent" xml:space="preserve">
-    <value>groupBoxIstad</value>
-  </data>
-  <data name="&gt;&gt;textBoxIstaLocation.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>