diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 860e00a..00b892a 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -351,6 +351,8 @@
                 mSaveToHomeScreen = true;
                 break;
             case FolderSpinnerAdapter.OTHER_FOLDER:
+                setupTopCrumb();
+                getLoaderManager().restartLoader(LOADER_ID_FOLDER_CONTENTS, null, this);
                 switchToFolderSelector();
                 break;
             case FolderSpinnerAdapter.RECENT_FOLDER:
@@ -382,7 +384,7 @@
         mAddNewFolder.setVisibility(View.VISIBLE);
         mAddSeparator.setVisibility(View.VISIBLE);
         getInputMethodManager().hideSoftInputFromWindow(
-                mListView.getWindowToken(), 0);
+                mFolderNamer.getWindowToken(), 0);
     }
 
     private long addFolderToCurrent(String name) {
diff --git a/src/com/android/browser/BrowserYesNoPreference.java b/src/com/android/browser/BrowserYesNoPreference.java
index d73ea08..eae9a8b 100644
--- a/src/com/android/browser/BrowserYesNoPreference.java
+++ b/src/com/android/browser/BrowserYesNoPreference.java
@@ -50,6 +50,7 @@
         mNeutralBtnTxt = a.getString(R.styleable.BrowserYesNoPreference_neutralButtonText);
         mPositiveBtnTxt = a.getString(R.styleable.BrowserYesNoPreference_positiveButtonText);
         mNegativeBtnTxt = a.getString(R.styleable.BrowserYesNoPreference_negativeButtonText);
+        setDialogIcon(R.drawable.ic_sp_level_warning);
     }
 
     @Override