diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index e979baf53..13ae41ae9 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -407,7 +407,7 @@ public class PasswordStore extends ActionBarActivity  {
         if  ((null != plist)) {
             return plist.getCurrentDir();
         }
-        return null;
+        return PasswordRepository.getWorkTree();
     }
 
     protected void onActivityResult(int requestCode, int resultCode,