diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java
index 479adf176..9aa227e4f 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java
@@ -79,8 +79,11 @@ public void releaseWidget() {
 
     @Override
     protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
-        aPlacement.width = WidgetPlacement.dpDimension(getContext(), R.dimen.navigation_bar_width);
-        aPlacement.worldWidth = WidgetPlacement.floatDimension(getContext(), R.dimen.window_world_width);
+        aPlacement.width = WidgetPlacement.dpDimension(getContext(), R.dimen.title_bar_width);
+        float ratio = WidgetPlacement.floatDimension(getContext(), R.dimen.window_world_width) /
+                      WidgetPlacement.dpDimension(getContext(), R.dimen.navigation_bar_width);
+
+        aPlacement.worldWidth = aPlacement.width * ratio;
         aPlacement.height = WidgetPlacement.dpDimension(getContext(), R.dimen.navigation_bar_height);
         aPlacement.anchorX = 0.5f;
         aPlacement.anchorY = 1.0f;
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
index 96cc28027..f98a9a93f 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -238,11 +238,13 @@ public void closeWindow(@NonNull WindowWidget aWindow) {
         if (leftWindow == aWindow) {
             removeWindow(leftWindow);
             if (mFocusedWindow == leftWindow) {
+                mFocusedWindow = null;
                 focusWindow(frontWindow);
             }
         } else if (rightWindow == aWindow) {
             removeWindow(rightWindow);
             if (mFocusedWindow == rightWindow) {
+                mFocusedWindow = null;
                 focusWindow(frontWindow);
             }
         } else if (frontWindow == aWindow) {
@@ -254,6 +256,7 @@ public void closeWindow(@NonNull WindowWidget aWindow) {
             }
 
             if (mFocusedWindow == frontWindow && !getCurrentWindows().isEmpty()) {
+                mFocusedWindow = null;
                 focusWindow(getFrontWindow());
             }
 
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 706768f6d..cf0291993 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -18,6 +18,9 @@
     <dimen name="url_bar_item_width">28dp</dimen>
     <dimen name="url_bar_last_item_width">36dp</dimen>
 
+    <!-- Title bar -->
+    <dimen name="title_bar_width">300dp</dimen>
+
     <!-- Keyboard -->
     <item name="keyboard_world_width" format="float" type="dimen">3.25</item>
     <item name="keyboard_x" format="float" type="dimen">-0.15</item>