diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 50f4189..54fb96f 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1379,6 +1379,10 @@
                 openTabToHomePage();
                 break;
 
+            case R.id.incognito_menu_id:
+                openIncognitoTab();
+                break;
+
             case R.id.goto_menu_id:
                 editUrl();
                 break;
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 6fc919e..3d8a44f 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -209,6 +209,7 @@
         TabViewData mTabData;
         View mTabContent;
         TextView mTitle;
+        View mIncognito;
         ImageView mIconView;
         ImageView mLock;
         ImageView mClose;
@@ -231,6 +232,7 @@
             mLock = (ImageView) mTabContent.findViewById(R.id.lock);
             mClose = (ImageView) mTabContent.findViewById(R.id.close);
             mClose.setOnClickListener(this);
+            mIncognito = mTabContent.findViewById(R.id.incognito);
             mSelected = false;
             mInLoad = false;
             // update the status
@@ -259,6 +261,11 @@
             if (mTabData.mLock != null) {
                 setLock(mTabData.mLock);
             }
+            if (mTabData.mTab != null) {
+                mIncognito.setVisibility(
+                        mTabData.mTab.getWebView().isPrivateBrowsingEnabled() ?
+                        View.VISIBLE : View.GONE);
+            }
         }
 
         @Override
