diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index a22a77a..8bced69 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1012,16 +1012,18 @@
     }
 
     @Override
+    public void onBackPressed() {
+        if (mFastTrack.isShowing()) {
+            // Back key dismisses fast-track when its visible
+            mFastTrack.dismiss();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK: {
-                if (mFastTrack.isShowing()) {
-                    // Back key dismisses fast-track when its visible
-                    mFastTrack.dismiss();
-                    return true;
-                }
-                break;
-            }
             case KeyEvent.KEYCODE_CALL: {
                 if (callSelection()) {
                     return true;
diff --git a/src/com/android/contacts/DialtactsActivity.java b/src/com/android/contacts/DialtactsActivity.java
index 73d702b..2ba3d26 100644
--- a/src/com/android/contacts/DialtactsActivity.java
+++ b/src/com/android/contacts/DialtactsActivity.java
@@ -316,18 +316,16 @@
     }
 
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // Handle BACK
-        if (keyCode == KeyEvent.KEYCODE_BACK && isTaskRoot()) {
+    public void onBackPressed() {
+        if (isTaskRoot()) {
             // Instead of stopping, simply push this to the back of the stack.
             // This is only done when running at the top of the stack;
             // otherwise, we have been launched by someone else so need to
             // allow the user to go back to the caller.
             moveTaskToBack(false);
-            return true;
+        } else {
+            super.onBackPressed();
         }
-        
-        return super.onKeyDown(keyCode, event);
     }
 
     /** {@inheritDoc} */
diff --git a/src/com/android/contacts/SocialStreamActivity.java b/src/com/android/contacts/SocialStreamActivity.java
index 3110e92..2d84df2 100644
--- a/src/com/android/contacts/SocialStreamActivity.java
+++ b/src/com/android/contacts/SocialStreamActivity.java
@@ -153,16 +153,14 @@
         mFastTrack.show(aggUri, mRect, Intents.MODE_MEDIUM, null);
     }
 
-    /** {@inheritDoc} */
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // Back key dismisses fast-track when its visible
-        if (keyCode == KeyEvent.KEYCODE_BACK && mFastTrack.isShowing()) {
+    public void onBackPressed() {
+        if (mFastTrack.isShowing()) {
+            // Back key dismisses fast-track when its visible
             mFastTrack.dismiss();
-            return true;
+        } else {
+            super.onBackPressed();
         }
-
-        return super.onKeyDown(keyCode, event);
     }
 
     @Override
