diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 8db6592a53487..0b0e6a8565725 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -9742,6 +9742,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             View view = null;
             for (int i = 0; i < mNumberOfSuggestions; i++) {
                 view = mSuggestionsAdapter.getView(i, view, mContentView);
+                view.getLayoutParams().width = LayoutParams.WRAP_CONTENT;
                 view.measure(horizontalMeasure, verticalMeasure);
                 width = Math.max(width, view.getMeasuredWidth());
             }
diff --git a/core/res/res/layout/text_edit_suggestion_item.xml b/core/res/res/layout/text_edit_suggestion_item.xml
index 082c5ec031c0f..0e2b04f3a59b5 100644
--- a/core/res/res/layout/text_edit_suggestion_item.xml
+++ b/core/res/res/layout/text_edit_suggestion_item.xml
@@ -15,7 +15,7 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:layout_width="wrap_content"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:paddingLeft="16dip"
           android:paddingRight="16dip"