diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
new file mode 100644
index 0000000..0186b6f
--- /dev/null
+++ b/res/layout-land/nav_screen.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     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"
+    android:id="@+id/nav_screen"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+    <LinearLayout
+        android:id="@+id/navtop"
+        android:layout_height="match_parent"
+        android:layout_width="44dip"
+        android:orientation="vertical"
+        android:background="#80404040">
+        <ImageButton
+            android:id="@+id/newtab"
+            android:layout_height="0dip"
+            android:layout_weight="0.25"
+            android:layout_width="match_parent"
+            style="@style/HoloButton"
+            android:gravity="center_vertical"
+            android:src="@drawable/ic_new_window_holo_dark" />
+        <ImageButton
+            android:id="@+id/newincognito"
+            android:layout_height="0dip"
+            android:layout_weight="0.25"
+            android:layout_width="match_parent"
+            style="@style/HoloButton"
+            android:gravity="center_vertical"
+            android:src="@drawable/ic_new_incognito_holo_dark" />
+        <ImageButton
+            android:id="@+id/tabs"
+            android:layout_height="0dip"
+            android:layout_weight="0.25"
+            android:layout_width="match_parent"
+            style="@style/HoloButton"
+            android:gravity="center_vertical"
+            android:src="@drawable/ic_windows_holo_dark" />
+        <ImageButton
+            android:id="@+id/more"
+            android:layout_height="0dip"
+            android:layout_weight="0.25"
+            android:layout_width="match_parent"
+            style="@style/HoloButton"
+            android:gravity="center_vertical"
+            android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
+    </LinearLayout>
+    <FrameLayout
+        android:id="@+id/galleryholder"
+        android:layout_height="match_parent"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp" />
+    <LinearLayout
+        android:id="@+id/navbar"
+        android:layout_height="match_parent"
+        android:layout_width="44dip"
+        android:orientation="vertical"
+        android:background="#80404040">
+        <ImageButton
+            android:id="@+id/back"
+            android:layout_width="match_parent"
+            android:layout_weight="0.25"
+            android:layout_height="0dip"
+            android:src="@drawable/ic_back_holo_dark"
+            style="@style/HoloButton" />
+        <ImageButton
+            android:id="@+id/refresh"
+            android:layout_width="match_parent"
+            android:layout_weight="0.25"
+            android:layout_height="0dip"
+            android:src="@drawable/ic_refresh_holo_dark"
+            style="@style/HoloButton" />
+        <ImageButton
+            android:id="@+id/forward"
+            android:layout_width="match_parent"
+            android:layout_weight="0.25"
+            android:layout_height="0dip"
+            android:src="@drawable/ic_forward_holo_dark"
+            style="@style/HoloButton" />
+        <ImageButton
+            android:id="@+id/bookmarks"
+            android:layout_width="match_parent"
+            android:layout_weight="0.25"
+            android:layout_height="0dip"
+            android:src="@drawable/ic_bookmarks_history_holo_dark"
+            style="@style/HoloButton" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index e636b2b..1a25671 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -316,7 +316,9 @@
                 @Override
                 public void onClick(View v) {
                     close(false);
+                    mUi.getTitleBar().setSkipTitleBarAnimations(true);
                     mUi.editUrl(false);
+                    mUi.getTitleBar().setSkipTitleBarAnimations(false);
                 }
             });
             return convertView;