diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml
index b3b6c7a59..62ef77313 100644
--- a/MyTracks/res/menu/track_list.xml
+++ b/MyTracks/res/menu/track_list.xml
@@ -26,9 +26,10 @@ limitations under the License.
     android:showAsAction="always"
     android:title="@string/menu_stop_recording"/>
   <item
+    android:actionViewClass="android.widget.SearchView"
     android:icon="@drawable/menu_search"
     android:id="@+id/menu_search"
-    android:showAsAction="always"
+    android:showAsAction="always|collapseActionView"
     android:title="@string/menu_search"/>
   <item
     android:id="@+id/menu_import_all"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index f8c42b31b..728f685bc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -39,6 +39,7 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -87,6 +88,7 @@ public class TrackListActivity extends Activity {
 
   private MenuItem recordTrack;
   private MenuItem stopRecording;
+  private MenuItem search;
   private MenuItem importAll;
   private MenuItem exportAll;
   private MenuItem deleteAll;
@@ -190,18 +192,17 @@ public class TrackListActivity extends Activity {
   @Override
   public boolean onCreateOptionsMenu(Menu menu) {
     getMenuInflater().inflate(R.menu.track_list, menu);
-    return true;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
+    
     recordTrack = menu.findItem(R.id.menu_record_track);
     stopRecording = menu.findItem(R.id.menu_stop_recording);
+    search = menu.findItem(R.id.menu_search);
     importAll = menu.findItem(R.id.menu_import_all);
     exportAll = menu.findItem(R.id.menu_export_all);
     deleteAll = menu.findItem(R.id.menu_delete_all);
+    
+    ApiAdapterFactory.getApiAdapter().configureSearchWidget(this, search);   
     updateMenu();
-    return super.onPrepareOptionsMenu(menu);
+    return true;
   }
 
   /**
@@ -260,8 +261,7 @@ public class TrackListActivity extends Activity {
         trackRecordingServiceConnection.stop();
         return true;
       case R.id.menu_search:
-        onSearchRequested();
-        return true;
+        return ApiAdapterFactory.getApiAdapter().handleSearchMenuSelection(this);
       case R.id.menu_import_all:
         startActivity(new Intent(this, ImportActivity.class)
             .putExtra(ImportActivity.EXTRA_IMPORT_ALL, true));
@@ -382,4 +382,14 @@ public class TrackListActivity extends Activity {
         .setTitle(R.string.track_list_export_all)
         .create();
   }
+ 
+  @Override
+  public boolean onKeyUp(int keyCode, KeyEvent event) {
+    if (keyCode == KeyEvent.KEYCODE_SEARCH) {
+      if (ApiAdapterFactory.getApiAdapter().handleSearchKey(search)) {
+        return true;
+      }
+    }
+    return super.onKeyUp(keyCode, event);
+  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
index d0527c63b..00396f572 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api11Adapter.java
@@ -16,18 +16,37 @@
 
 package com.google.android.apps.mytracks.util;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.SearchManager;
+import android.content.Context;
+import android.view.MenuItem;
 import android.view.Window;
+import android.widget.SearchView;
 
 /**
  * API level 11 specific implementation of the {@link ApiAdapter}.
  *
  * @author Jimmy Shih
  */
-public class Api11Adapter extends Api9Adapter {
+@TargetApi(11)
+public class Api11Adapter extends Api10Adapter {
 
   @Override
   public void showActionBar(Activity activity) {
     activity.requestWindowFeature(Window.FEATURE_ACTION_BAR);
   }
+  
+  @Override
+  public void configureSearchWidget(Activity activity, MenuItem menuItem) {
+    SearchManager searchManager = (SearchManager) activity.getSystemService(Context.SEARCH_SERVICE);
+    SearchView searchView = (SearchView) menuItem.getActionView();
+    searchView.setSearchableInfo(searchManager.getSearchableInfo(activity.getComponentName()));
+  }
+
+  @Override
+  public boolean handleSearchMenuSelection(Activity activity) {
+    // Returns false to allow the platform to expand the search widget.
+    return false;
+  }  
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java
new file mode 100644
index 000000000..ddd8376c7
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api14Adapter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.android.apps.mytracks.util;
+
+import android.annotation.TargetApi;
+import android.view.MenuItem;
+
+/**
+ * API level 14 specific implementation of the {@link ApiAdapter}.
+ *
+ * @author Jimmy Shih
+ */
+@TargetApi(14)
+public class Api14Adapter extends Api11Adapter {
+
+  @Override
+  public boolean handleSearchKey(MenuItem menuItem) {
+    menuItem.expandActionView();
+    return true;
+  }
+}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
index 1d6a6e8bd..1f7e8aefe 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api7Adapter.java
@@ -30,6 +30,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.Window;
 
 import java.io.IOException;
@@ -108,4 +109,21 @@ public class Api7Adapter implements ApiAdapter {
     // via the regular menu.
     activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
   }
+  
+  @Override
+  public void configureSearchWidget(Activity activity, MenuItem menuItem) {
+    // Do nothing   
+  }
+  
+  @Override
+  public boolean handleSearchMenuSelection(Activity activity) {
+    activity.onSearchRequested();
+    return true;
+  }
+  
+  @Override
+  public boolean handleSearchKey(MenuItem menuItem) {
+    // Return false and allow the framework to handle the search key.
+    return false;
+  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
index 87ea57ab6..efdb86c25 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapter.java
@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.view.MenuItem;
 
 import java.io.IOException;
 
@@ -110,4 +111,31 @@ public interface ApiAdapter {
    */
   public void showActionBar(Activity activity);
 
+  /**
+   * Configures the search widget.
+   * 
+   * Due to changes in API level 11.
+   * 
+   * @param activity the activity
+   * @param menuItem the search menu item
+   */
+  public void configureSearchWidget(Activity activity, MenuItem menuItem);
+ 
+  /**
+   * Handles the search menu selection. Returns true if handled.
+   * 
+   * Due to changes in API level 11.
+   * 
+   * @param activity the activity
+   */
+  public boolean handleSearchMenuSelection(Activity activity);
+  
+  /**
+   * Handles the search key press. Returns true if handled.
+   * 
+   * Due to changes in API level 14.
+   * 
+   * @param menu the search menu
+   */
+  public boolean handleSearchKey(MenuItem menu);  
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java
index 43ff5ee65..589aa7926 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ApiAdapterFactory.java
@@ -31,7 +31,10 @@ public class ApiAdapterFactory {
    */
   public static ApiAdapter getApiAdapter() {
     if (apiAdapter == null) {
-      if (Build.VERSION.SDK_INT >= 11) {
+      if (Build.VERSION.SDK_INT >= 14) {
+        apiAdapter = new Api14Adapter();
+        return apiAdapter;
+      } else if (Build.VERSION.SDK_INT >= 11) {
         apiAdapter = new Api11Adapter();
         return apiAdapter;
       } else if (Build.VERSION.SDK_INT >= 10) {