diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
index 57d50ad..978b140 100644
--- a/java/com/android/incallui/ReturnToCallController.java
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -134,11 +134,15 @@
 
   @Override
   public void onDisconnect(DialerCall call) {
-    if (bubble != null && bubble.isVisible() && !TelecomUtil.isInCall(context)) {
+    boolean hasAnotherCall = CallList.getInstance().getActiveOrBackgroundCall() != null;
+    if (bubble != null
+        && bubble.isVisible()
+        && (!TelecomUtil.isInCall(context) || hasAnotherCall)) {
       bubble.showText(context.getText(R.string.incall_call_ended));
     }
-
-    hide();
+    if (!hasAnotherCall) {
+      hide();
+    }
   }
 
   @Override