diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index db7d0c44a..100d0af01 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -540,7 +540,7 @@ public class TrackListActivity extends FragmentActivity implements DeleteOneTrac
 
   @Override
   public boolean onKeyUp(int keyCode, KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_SEARCH) {
+    if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) {
       if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) {
         return true;
       }