diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index bb8ffc17d60..d592fcc5058 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -68,7 +68,9 @@ public class UsbModeChooserActivity extends Activity {
             String action = intent.getAction();
             if (UsbManager.ACTION_USB_STATE.equals(action)) {
                 boolean connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
-                if (!connected) {
+                boolean hostConnected =
+                        intent.getBooleanExtra(UsbManager.USB_HOST_CONNECTED, false);
+                if (!connected && !hostConnected) {
                     mDialog.dismiss();
                 }
             }