diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index eb242c9..e52d3f0 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -777,6 +777,7 @@
     // Called once we have determined which folder is the root folder
     private void onRootFolderFound(long root) {
         mRootFolder = root;
+        mCurrentFolder = (mCurrentFolder == -1) ? mRootFolder : mCurrentFolder;
         setupTopCrumb();
         onCurrentFolderFound();
     }