diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 56c2856..14ac2ae 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -34,6 +34,7 @@
 import android.speech.RecognizerIntent;
 import android.text.SpannableString;
 import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.style.ImageSpan;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -242,6 +243,7 @@
         if (mInVoiceMode) {
             rightButtonDrawable = mVoiceDrawable;
             titleDrawable = mVoiceModeBackground;
+            mTitle.setEllipsize(null);
         } else {
             titleDrawable = mNormalBackground;
             if (mInLoad) {
@@ -249,6 +251,7 @@
             } else {
                 rightButtonDrawable = mBookmarkDrawable;
             }
+            mTitle.setEllipsize(TextUtils.TruncateAt.END);
         }
         mTitle.setSingleLine(!mInVoiceMode);
         mTitleBg.setBackgroundDrawable(titleDrawable);
