diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7dd365d9189..2d9cbdcf688 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2084,11 +2084,9 @@ found in the list of installed applications.</string>
 
     <!-- Text-To-Speech (TTS) settings --><skip />
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
-    <string name="tts_settings">Text-to-speech</string>
-    <!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality  -->
-    <string name="tts_settings_summary">Set text-to-speech options</string>
+    <string name="tts_settings">Text-to-speech settings</string>
     <!-- Main TTS Settings screen title -->
-    <string name="tts_settings_title">Text-to-speech</string>
+    <string name="tts_settings_title">Text-to-speech settings</string>
     <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
     <string name="use_default_tts_settings_title">Always use my settings</string>
     <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
index 62c909f7a23..4011038e21d 100644
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ b/src/com/android/settings/VoiceInputOutputSettings.java
@@ -92,8 +92,20 @@ public class VoiceInputOutputSettings extends PreferenceActivity
             removePreference(mRecognizerPref);
             removePreference(mSettingsPref);
         } else if (numAvailable == 1) {
-            // Only one recognizer available, so don't show the list of choices.
+            // Only one recognizer available, so don't show the list of choices, but do
+            // set up the link to settings for the available recognizer.
             removePreference(mRecognizerPref);
+            
+            // But first set up the available recognizers map with just the one recognizer.
+            ResolveInfo resolveInfo = availableRecognitionServices.get(0);
+            String recognizerComponent =
+                    new ComponentName(resolveInfo.serviceInfo.packageName,
+                            resolveInfo.serviceInfo.name).flattenToString();
+            mAvailableRecognizersMap.put(recognizerComponent, resolveInfo);
+            
+            String currentSetting = Settings.Secure.getString(
+                    getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
+            updateSettingsLink(currentSetting);
         } else {
             // Multiple recognizers available, so show the full list of choices.
             populateRecognizerPreference(availableRecognitionServices);
@@ -186,6 +198,7 @@ public class VoiceInputOutputSettings extends PreferenceActivity
             Intent i = new Intent(Intent.ACTION_MAIN);
             i.setComponent(new ComponentName(si.packageName, settingsActivity));
             mSettingsPref.setIntent(i);
+            mRecognizerPref.setSummary(currentRecognizer.loadLabel(getPackageManager()));
         }
     }