diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 8d8fc8a..5adb052 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -318,7 +318,8 @@
         }
 
         mHandoffButton.setEnabled(isHandoffCapable && !isHandoffPending);
-        mHandoffButton.setVisibility(mHandoffButton.isEnabled() ? View.VISIBLE : View.GONE);
+        mHandoffButton.setVisibility(isWiFi || mHandoffButton.isEnabled() ?
+                View.VISIBLE : View.GONE);
         mHandoffButton.setImageResource(isWiFi ?
                 R.drawable.ic_in_call_wifi : R.drawable.ic_in_call_pstn);
     }