diff --git a/MyTracks/res/layout/search_list.xml b/MyTracks/res/layout/search_list.xml
new file mode 100644
index 000000000..706f7107b
--- /dev/null
+++ b/MyTracks/res/layout/search_list.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <ListView android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" />
+  <TextView android:id="@android:id/empty"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:text="@string/search_no_results"
+    android:textColor="@android:color/white"
+    android:textSize="20dip"
+    android:textStyle="bold"
+    android:gravity="center"
+    android:visibility="gone" />
+</LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index a088a9a19..21cb7ae83 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1115,6 +1115,11 @@ limitations under the License.
       keeping this consistent with other Android apps.">
     Search My Tracks
   </string>
+  <string name="search_no_results"
+    translation_description="Message shown instead of a list of results to indicate there were no
+      search results.">
+    No tracks or waypoints matched your search.
+  </string>
   <string name="search_voice_prompt"
     translation_description="Prompt shown when the user activates voice search, asking him to speak
       what will be searched for.">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java
index 9b153847e..db8fae1f0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java
@@ -83,6 +83,8 @@ public class SearchActivity extends ListActivity {
     locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
     preferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
 
+    setContentView(R.layout.search_list);
+
     handleIntent(getIntent());
   }