diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 8d9de5c630a..89f503eebf1 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -237,6 +237,8 @@ public class BrowserApp extends GeckoApp
         final View view;
         if (BrowserToolbar.class.getName().equals(name)) {
             view = BrowserToolbar.create(context, attrs);
+        } else if (TabsPanel.TabsLayout.class.getName().equals(name)) {
+            view = TabsPanel.createTabsLayout(context, attrs);
         } else {
             view = super.onCreateView(name, context, attrs);
         }
diff --git a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
index b356fc97101..4b05034e333 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
@@ -32,13 +32,14 @@
           android:layout_height="0dip"
           android:layout_weight="1.0">
 
-        <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/normal_tabs"
-                                               style="@style/TabsList"
-                                               android:layout_width="match_parent"
-                                               android:layout_height="match_parent"
-                                               android:choiceMode="singleChoice"
-                                               android:visibility="gone"
-                                               gecko:tabs="tabs_normal"/>
+        <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+              android:id="@+id/normal_tabs"
+              style="@style/TabsList"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:choiceMode="singleChoice"
+              android:visibility="gone"
+              gecko:tabs="tabs_normal"/>
 
         <org.mozilla.gecko.tabs.PrivateTabsPanel
                 android:id="@+id/private_tabs_panel"
diff --git a/mobile/android/base/resources/layout/private_tabs_panel.xml b/mobile/android/base/resources/layout/private_tabs_panel.xml
index 73197ca7a78..83f05c367a8 100644
--- a/mobile/android/base/resources/layout/private_tabs_panel.xml
+++ b/mobile/android/base/resources/layout/private_tabs_panel.xml
@@ -47,11 +47,12 @@
 
     <!-- Note: for an unknown reason, scrolling in the TabsListLayout
          does not work unless it is laid out after the empty view. -->
-    <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/private_tabs_tray"
-                                           style="@style/TabsList"
-                                           android:layout_width="match_parent"
-                                           android:layout_height="match_parent"
-                                           android:choiceMode="singleChoice"
-                                           gecko:tabs="tabs_private"/>
+    <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+          android:id="@+id/private_tabs_tray"
+          style="@style/TabsList"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:choiceMode="singleChoice"
+          gecko:tabs="tabs_private"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/tabs_panel.xml b/mobile/android/base/resources/layout/tabs_panel.xml
index 80a7b3cca19..691c4e15a1d 100644
--- a/mobile/android/base/resources/layout/tabs_panel.xml
+++ b/mobile/android/base/resources/layout/tabs_panel.xml
@@ -31,13 +31,14 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content">
 
-        <org.mozilla.gecko.tabs.TabsListLayout android:id="@+id/normal_tabs"
-                                               style="@style/TabsList"
-                                               android:layout_width="match_parent"
-                                               android:layout_height="match_parent"
-                                               android:choiceMode="singleChoice"
-                                               android:visibility="gone"
-                                               gecko:tabs="tabs_normal"/>
+        <view class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout"
+              android:id="@+id/normal_tabs"
+              style="@style/TabsList"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:choiceMode="singleChoice"
+              android:visibility="gone"
+              gecko:tabs="tabs_normal"/>
 
         <org.mozilla.gecko.tabs.PrivateTabsPanel
                 android:id="@+id/private_tabs_panel"
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index 689257a2aad..ef16e27245d 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -65,6 +65,10 @@ public class TabsPanel extends LinearLayout
         public void setEmptyView(View view);
     }
 
+    public static View createTabsLayout(final Context context, final AttributeSet attrs) {
+       return new TabsListLayout(context, attrs);
+    }
+
     public static interface TabsLayoutChangeListener {
         public void onTabsLayoutChange(int width, int height);
     }