diff --git a/examples/component/homescreen.cpp b/examples/component/homescreen.cpp
index 6758e241..1086db3e 100644
--- a/examples/component/homescreen.cpp
+++ b/examples/component/homescreen.cpp
@@ -337,13 +337,15 @@ int main(int argc, const char* argv[]) {
       L"htop", L"color", L"spinner", L"gauge", L"compiler",
   };
   auto tab_selection = Toggle(&tab_entries, &tab_index);
-  auto tab_content = Container::Tab(&tab_index, {
-                                                    htop,
-                                                    color_tab_renderer,
-                                                    spinner_tab_renderer,
-                                                    gauge_component,
-                                                    compiler_renderer,
-                                                });
+  auto tab_content = Container::Tab(
+      {
+          htop,
+          color_tab_renderer,
+          spinner_tab_renderer,
+          gauge_component,
+          compiler_renderer,
+      },
+      &tab_index);
 
   auto main_container = Container::Vertical({
       tab_selection,
diff --git a/examples/component/modal_dialog.cpp b/examples/component/modal_dialog.cpp
index 7db37582..7c24a8b1 100644
--- a/examples/component/modal_dialog.cpp
+++ b/examples/component/modal_dialog.cpp
@@ -66,10 +66,12 @@ int main(int argc, const char* argv[]) {
            border;
   });
 
-  auto main_container = Container::Tab(&depth, {
-                                                   depth_0_renderer,
-                                                   depth_1_renderer,
-                                               });
+  auto main_container = Container::Tab(
+      {
+          depth_0_renderer,
+          depth_1_renderer,
+      },
+      &depth);
 
   auto main_renderer = Renderer(main_container, [&] {
     Element document = depth_0_renderer->Render();
diff --git a/examples/component/tab_horizontal.cpp b/examples/component/tab_horizontal.cpp
index 578dff28..016f83c6 100644
--- a/examples/component/tab_horizontal.cpp
+++ b/examples/component/tab_horizontal.cpp
@@ -41,11 +41,12 @@ int main(int argc, const char* argv[]) {
   };
   int tab_3_selected = 0;
   auto tab_container = Container::Tab(
-      &tab_selected, {
-                         Radiobox(&tab_1_entries, &tab_1_selected),
-                         Radiobox(&tab_2_entries, &tab_2_selected),
-                         Radiobox(&tab_3_entries, &tab_3_selected),
-                     });
+      {
+          Radiobox(&tab_1_entries, &tab_1_selected),
+          Radiobox(&tab_2_entries, &tab_2_selected),
+          Radiobox(&tab_3_entries, &tab_3_selected),
+      },
+      &tab_selected);
 
   auto container = Container::Vertical({
       tab_toggle,
diff --git a/examples/component/tab_vertical.cpp b/examples/component/tab_vertical.cpp
index ad454d73..5c4daf16 100644
--- a/examples/component/tab_vertical.cpp
+++ b/examples/component/tab_vertical.cpp
@@ -41,11 +41,12 @@ int main(int argc, const char* argv[]) {
   };
   int tab_3_selected = 0;
   auto tab_container = Container::Tab(
-      &tab_selected, {
-                         Radiobox(&tab_1_entries, &tab_1_selected),
-                         Radiobox(&tab_2_entries, &tab_2_selected),
-                         Radiobox(&tab_3_entries, &tab_3_selected),
-                     });
+      {
+          Radiobox(&tab_1_entries, &tab_1_selected),
+          Radiobox(&tab_2_entries, &tab_2_selected),
+          Radiobox(&tab_3_entries, &tab_3_selected),
+      },
+      &tab_selected);
 
   auto container = Container::Horizontal({
       tab_menu,
diff --git a/include/ftxui/component/component.hpp b/include/ftxui/component/component.hpp
index 11abf6de..eaaaf117 100644
--- a/include/ftxui/component/component.hpp
+++ b/include/ftxui/component/component.hpp
@@ -36,7 +36,7 @@ Component Slider(StringRef label, T* value, T min, T max, T increment);
 namespace Container {
 Component Vertical(Components children);
 Component Horizontal(Components children);
-Component Tab(int* selector, Components children);
+Component Tab(Components children, int* selector);
 }  // namespace Container
 
 }  // namespace ftxui
diff --git a/include/ftxui/component/container.hpp b/include/ftxui/component/container.hpp
index f15b65fa..82092818 100644
--- a/include/ftxui/component/container.hpp
+++ b/include/ftxui/component/container.hpp
@@ -18,7 +18,7 @@ class ContainerBase : public ComponentBase {
   static Component Horizontal(Components children);
 
   static Component Tab(int* selector);
-  static Component Tab(int* selector, Components children);
+  static Component Tab(Components children, int* selector);
 
   ~ContainerBase() override = default;
 
diff --git a/src/ftxui/component/container.cpp b/src/ftxui/component/container.cpp
index 361096bb..5df5033c 100644
--- a/src/ftxui/component/container.cpp
+++ b/src/ftxui/component/container.cpp
@@ -62,15 +62,15 @@ Component Horizontal(Components children) {
 ///
 /// ```cpp
 /// int tab_drawn = 0;
-/// auto container = Container::Tab(&tab_drawn, {
+/// auto container = Container::Tab({
 ///   children_1,
 ///   children_2,
 ///   children_3,
 ///   children_4,
-/// });
+/// }, &tab_drawn);
 /// ```
-Component Tab(int* selector, Components children) {
-  return ContainerBase::Tab(selector, std::move(children));
+Component Tab(Components children, int* selector) {
+  return ContainerBase::Tab(std::move(children), selector);
 }
 
 }  // namespace Container
@@ -107,11 +107,11 @@ Component ContainerBase::Horizontal(Components children) {
 
 // static
 Component ContainerBase::Tab(int* selector) {
-  return Tab(selector, {});
+  return Tab({}, selector);
 }
 
 // static
-Component ContainerBase::Tab(int* selector, Components children) {
+Component ContainerBase::Tab(Components children, int* selector) {
   auto container = std::make_shared<ContainerBase>();
   container->selector_ = selector;
   container->event_handler_ = &ContainerBase::TabEvent;