diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
index 057dc1353..c851de52e 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
@@ -234,6 +234,7 @@ namespace BlackGui
         {
             if (existingDirs.isEmpty() || removeDirectories.isEmpty()) { return existingDirs; }
             const QStringList rDirs = CFileUtils::fixWindowsUncPaths(removeDirectories);
+            const QStringList eDirs = CFileUtils::fixWindowsUncPaths(eDirs);
             QStringList dirs;
             for (const QString &dir : existingDirs)
             {
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/blackgui/components/settingssimulatorbasicscomponent.ui
index a9405b28b..0bb6e48b1 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.ui
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Frame</string>
+   <string>Simulator basic settings</string>
   </property>
   <property name="frameShape">
    <enum>QFrame::StyledPanel</enum>
@@ -131,6 +131,9 @@
    </item>
    <item row="3" column="4">
     <widget class="QPushButton" name="pb_AdjustModelDirectory">
+     <property name="toolTip">
+      <string>remove redundant directories, fix file paths ...</string>
+     </property>
      <property name="text">
       <string>adjust</string>
      </property>
@@ -146,6 +149,18 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>le_SimulatorDirectory</tabstop>
+  <tabstop>pb_SimulatorFileDialog</tabstop>
+  <tabstop>pte_ModelDirectories</tabstop>
+  <tabstop>pb_ModelFileDialog</tabstop>
+  <tabstop>pb_AdjustModelDirectory</tabstop>
+  <tabstop>pte_ExcludeDirectories</tabstop>
+  <tabstop>pb_ExcludeFileDialog</tabstop>
+  <tabstop>pb_Reset</tabstop>
+  <tabstop>pb_CopyDefaults</tabstop>
+  <tabstop>pb_Save</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>