diff --git a/pdex/src/processing/mode/experimental/AutoSaveUtil.java b/pdex/src/processing/mode/experimental/AutoSaveUtil.java
index f2e2ae427..8811ed1d2 100644
--- a/pdex/src/processing/mode/experimental/AutoSaveUtil.java
+++ b/pdex/src/processing/mode/experimental/AutoSaveUtil.java
@@ -51,6 +51,11 @@ public class AutoSaveUtil {
     return false;
   }
   
+  public void reloadAutosaveDir(){
+    while(isSaving);
+    autosaveDir = new File(editor.getSketch().getFolder().getAbsolutePath() + File.separator + "_autosave");
+  }
+  
   public File getPastSave(){
     return pastSave;
   }
diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java
index a0336a4a9..5bcafd126 100755
--- a/pdex/src/processing/mode/experimental/DebugEditor.java
+++ b/pdex/src/processing/mode/experimental/DebugEditor.java
@@ -842,6 +842,8 @@ public class DebugEditor extends JavaEditor implements ActionListener {
                 });
             }
         }
+        //  if file location has changed, update autosaver
+        autosaver.reloadAutosaveDir();
         return saved;
     }
 
@@ -870,10 +872,15 @@ public class DebugEditor extends JavaEditor implements ActionListener {
             // set new name of variable inspector
             vi.setTitle(getSketch().getName());
         }
+        //  if file location has changed, update autosaver
+        autosaver.reloadAutosaveDir();
         return saved;
     }
     
     public void loadAutoSaver(){
+      if(autosaver != null){
+        autosaver.stop();
+      }
       autosaver = new AutoSaveUtil(this, dmode.autoSaveInterval);
       if(!autosaver.checkForPastSave()) {
         autosaver.init();