diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index f87220c..e84358f 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -125,6 +125,7 @@
     static final int UPDATE_BOOKMARK_THUMBNAIL = 108;
 
     private static final int OPEN_BOOKMARKS = 201;
+    private static final int OPEN_MENU = 202;
 
     private static final int EMPTY_MENU = -1;
 
@@ -546,6 +547,12 @@
                             updateScreenshot(tab);
                         }
                         break;
+
+                    case OPEN_MENU:
+                        if (!mOptionsMenuOpen && mActivity != null ) {
+                            mActivity.openOptionsMenu();
+                        }
+                        break;
                 }
             }
         };
@@ -614,6 +621,10 @@
         mConfigChanged = true;
         // update the menu in case of a locale change
         mActivity.invalidateOptionsMenu();
+        if (mOptionsMenuOpen) {
+            mActivity.closeOptionsMenu();
+            mHandler.sendMessageDelayed(mHandler.obtainMessage(OPEN_MENU), 100);
+        }
         if (mPageDialogsHandler != null) {
             mPageDialogsHandler.onConfigurationChanged(config);
         }