diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index cbf6eba..ab79b37 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -156,7 +156,7 @@
             }
             return true;
         }
-        return false;
+        return mUiController.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index ff7dc7c..d2d3797 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -185,16 +185,6 @@
         super.onDismiss(menu);
     }
 
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        onMenuHidden();
-        boolean res = mUiController.onOptionsItemSelected(item);
-        if (!res) {
-            return super.onMenuItemClick(item);
-        }
-        return res;
-    }
-
     private void onMenuHidden() {
         mOverflowMenuShowing = false;
         mPopupMenu = null;
