diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py
index dfab692aee..a1c1e58fc5 100644
--- a/src/Mod/Path/PathScripts/PathPreferences.py
+++ b/src/Mod/Path/PathScripts/PathPreferences.py
@@ -246,15 +246,19 @@ def setDefaultTaskPanelLayout(style):
 def experimentalFeaturesEnabled():
     return preferences().GetBool(EnableExperimentalFeatures, False)
 
+
 def suppressAllSpeedsWarning():
     return preferences().GetBool(WarningSuppressAllSpeeds, True)
 
+
 def suppressRapidSpeedsWarning():
     return suppressAllSpeedsWarning() or preferences().GetBool(WarningSuppressRapidSpeeds, True)
 
+
 def suppressSelectionModeWarning():
     return preferences().GetBool(WarningSuppressSelectionMode, True)
 
+
 def suppressOpenCamLibWarning():
     return preferences().GetBool(WarningSuppressOpenCamLib, True)
 
diff --git a/src/Mod/Path/PathScripts/PathToolBitGui.py b/src/Mod/Path/PathScripts/PathToolBitGui.py
index bc8b2ba7c4..1bf56aea68 100644
--- a/src/Mod/Path/PathScripts/PathToolBitGui.py
+++ b/src/Mod/Path/PathScripts/PathToolBitGui.py
@@ -247,7 +247,8 @@ def GetToolShapeFile(parent=None):
                                               location, '*.fcstd')
     if fname and fname[0]:
         if fname != location:
-            PathPreferences.setLastPathToolShape(location)
+            newloc = os.path.dirname(fname[0])
+            PathPreferences.setLastPathToolShape(newloc)
         return fname[0]
     else:
         return None
diff --git a/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py b/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py
index 931ca46dea..ea12f438b4 100644
--- a/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py
+++ b/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py
@@ -82,6 +82,7 @@ def checkWorkingDir():
         workingdir = workingdir[:-8]  # trim off trailing /Library if user chose it
 
     PathPreferences.setLastPathToolLibrary("{}{}Library".format(workingdir, os.path.sep))
+    PathPreferences.setLastPathToolBit("{}{}Bit".format(workingdir, os.path.sep))
     PathLog.debug('setting workingdir to: {}'.format(workingdir))
 
     subdirlist = ['Bit', 'Library', 'Shape']