--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -97,16 +97,19 @@ abstract public class BrowserApp extends
                 // fall through
             case SELECTED:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     if ("about:home".equals(tab.getURL()))
                         showAboutHome();
                     else
                         hideAboutHome();
 
+                    // Dismiss any SiteIdentity Popup
+                    SiteIdentityPopup.getInstance().dismiss();
+
                     final TabsPanel.Panel panel = tab.isPrivate()
                                                 ? TabsPanel.Panel.PRIVATE_TABS
                                                 : TabsPanel.Panel.NORMAL_TABS;
                     if (areTabsShown() && mTabsPanel.getCurrentPanel() != panel) {
                         mMainHandler.post(new Runnable() {
                             public void run() {
                                 showTabs(panel);
                             }

--- a/mobile/android/base/WebApp.java.in
+++ b/mobile/android/base/WebApp.java.in
@@ -31,17 +31,16 @@ import java.io.File;
 
 import org.mozilla.gecko.GeckoApp;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.WebAppAllocator;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.DoorHangerPopup;
 import org.json.JSONObject;
 
 public class WebApp extends GeckoApp {
     private URL mOrigin;
     private TextView mTitlebarText = null;
     private View mTitlebar = null;
     private static final String LOGTAG = "WebApp";
     private View mSplashscreen = null;