diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 7ee5c2a..e2d9386 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -67,6 +67,7 @@
     int mLinesLandscape;
     Object mResultsLock = new Object();
     List<String> mVoiceResults;
+    boolean mReverseResults;
 
     interface CompletionListener {
 
@@ -133,6 +134,9 @@
 
     @Override
     public SuggestItem getItem(int position) {
+        if (mReverseResults) {
+            position = (getCount() - 1) - position;
+        }
         if (mVoiceResults != null) {
             return new SuggestItem(mVoiceResults.get(position), null,
                     TYPE_SEARCH);
@@ -143,9 +147,13 @@
         return mMixedResults.items.get(position);
     }
 
+    public void setReverseResults(boolean reverse) {
+        mReverseResults = reverse;
+    }
+
     @Override
     public long getItemId(int position) {
-        return 0;
+        return position;
     }
 
     @Override
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index b479139..57cc724 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -87,11 +87,11 @@
                 R.drawable.textfield_active_holo_dark);
         mUnfocusDrawable = resources.getDrawable(
                 R.drawable.textfield_default_holo_dark);
-        rebuildLayout(activity, true);
+        initLayout(activity);
         mInVoiceMode = false;
     }
 
-    private void rebuildLayout(Context context, boolean rebuildData) {
+    private void initLayout(Context context) {
         LayoutInflater factory = LayoutInflater.from(context);
         factory.inflate(R.layout.url_bar, this);
 
@@ -143,6 +143,7 @@
 
     void setUseQuickControls(boolean useQuickControls) {
         mUseQuickControls = useQuickControls;
+        mUrlInput.setReverseResults(mUseQuickControls);
         if (mUseQuickControls) {
             mBackButton.setVisibility(View.GONE);
             mForwardButton.setVisibility(View.GONE);
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 8aeef31..428a0f2 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -29,7 +29,6 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.AutoCompleteTextView;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -218,4 +217,8 @@
                 item.extra);
     }
 
+    public void setReverseResults(boolean reverse) {
+        mAdapter.setReverseResults(reverse);
+    }
+
 }
