diff --git a/TODO b/TODO
index 8899a90..4996f59 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from efa10744835f7314bfdb2ce42546ae4aaa08e169
+* Continue rebasing from 90c8966f6cb153d6ab03e146d3ade33a03b94bdc
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.
diff --git a/include/guisan/widgets/tabbedarea.hpp b/include/guisan/widgets/tabbedarea.hpp
index 7a0811d..bfc201b 100644
--- a/include/guisan/widgets/tabbedarea.hpp
+++ b/include/guisan/widgets/tabbedarea.hpp
@@ -158,6 +158,13 @@ namespace gcn
          */
         virtual void removeTab(Tab* tab);
 
+        /**
+         * Returns the number of tabs in this tabbed area.
+         *
+         * @since 1.1.0
+         */
+        int getNumberOfTabs() const;
+
         /**
          * Checks if a tab given an index is selected or not.
          *
diff --git a/src/widgets/tabbedarea.cpp b/src/widgets/tabbedarea.cpp
index 84f79e9..5547917 100644
--- a/src/widgets/tabbedarea.cpp
+++ b/src/widgets/tabbedarea.cpp
@@ -197,6 +197,11 @@ namespace gcn
         adjustTabPositions();
     }
 
+    int TabbedArea::getNumberOfTabs() const
+    {
+        return mTabs.size();
+    }
+
     bool TabbedArea::isTabSelected(unsigned int index) const
     {
         if (index >= mTabs.size())