diff --git a/src/Mod/Path/PathScripts/PathToolLibraryManager.py b/src/Mod/Path/PathScripts/PathToolLibraryManager.py
index 1b74150c64..9efb060fee 100644
--- a/src/Mod/Path/PathScripts/PathToolLibraryManager.py
+++ b/src/Mod/Path/PathScripts/PathToolLibraryManager.py
@@ -156,11 +156,6 @@ class ToolLibraryManager():
         self.toolTables = []
         self.currentTableName = None
         self.loadToolTables()
-        
-        if len(self.toolTables):
-            self.currentTableName = self.toolTables[0].Name
-
-        return
 
     def getToolTables(self):
         ''' Return tool table list '''
@@ -302,6 +297,9 @@ class ToolLibraryManager():
                 tt = self.tooltableFromAttrs(table)
                 addTable(tt)
 
+        if len(self.toolTables):
+            self.currentTableName = self.toolTables[0].Name
+
     def saveMainLibrary(self):
         '''Persists the permanent library to FreeCAD user preferences'''
         tmpstring = json.dumps(self.templateAttrs())