diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 46fde6a..e0e7095 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -79,8 +79,11 @@
             }
 
             Bundle extras = intent.getExtras();
-            if (extras == null)
+            if (extras == null){
+                getFragmentManager().beginTransaction().replace(android.R.id.content,
+                        new GeneralPreferencesFragment()).commit();
                 return;
+            }
 
             String fragment = (String) extras.getCharSequence(PreferenceActivity.EXTRA_SHOW_FRAGMENT);
             if (fragment != null) {
diff --git a/src/com/android/browser/appmenu/AppMenu.java b/src/com/android/browser/appmenu/AppMenu.java
index 8453464..f0b9a5a 100644
--- a/src/com/android/browser/appmenu/AppMenu.java
+++ b/src/com/android/browser/appmenu/AppMenu.java
@@ -26,6 +26,8 @@
 import android.widget.PopupWindow.OnDismissListener;
 
 import org.chromium.base.SysUtils;
+
+import com.android.browser.BrowserSettings;
 import com.android.browser.R;
 
 import java.util.ArrayList;
@@ -159,7 +161,12 @@
         setMenuHeight(menuItems.size(), visibleDisplayFrame, screenHeight, sizingPadding);
         setPopupOffset(mPopup, mCurrentScreenRotation, visibleDisplayFrame, sizingPadding);
         mPopup.setOnItemClickListener(this);
+        boolean isImmersive = BrowserSettings.getInstance().useFullscreen();
+        if (isImmersive)
+            mPopup.setModal(false); //Disable modal here(it's required until this point)
         mPopup.show();
+        if (isImmersive)
+            mPopup.setModal(true); //Set modal after show, so that Immersive Mode doesn't break
         mPopup.getListView().setItemsCanFocus(true);
         mPopup.getListView().setOnKeyListener(this);