diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index d77d31c..8b2b633 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -104,6 +104,8 @@
     }
 
     public void refreshAdapter() {
+        mNewTab.setOnClickListener(this);
+        mNewIncognitoTab.setOnClickListener(this);
         mScroller.handleDataChanged(
                 mUiController.getTabControl().getTabPosition(mUi.getActiveTab()));
     }
@@ -143,8 +145,10 @@
     public void onClick(View v) {
         if (mNewTab == v) {
             openNewTab();
+            mNewIncognitoTab.setOnClickListener(null);
         } else if (mNewIncognitoTab == v) {
             openNewIncognitoTab();
+            mNewTab.setOnClickListener(null);
         } else if (mMore == v) {
             showPopupMenu();
         }