diff --git a/escher/include/escher/tab_view_cell.h b/escher/include/escher/tab_view_cell.h
index 09fefa3e2..c64659b16 100644
--- a/escher/include/escher/tab_view_cell.h
+++ b/escher/include/escher/tab_view_cell.h
@@ -11,6 +11,7 @@ public:
   void setName(const char * name);
   void setActive(bool active);
   void setSelected(bool selected);
+  KDSize minimalSizeForOptimalDisplay() override;
 protected:
 #if ESCHER_VIEW_LOGGING
   const char * className() const override;
diff --git a/escher/src/tab_view.cpp b/escher/src/tab_view.cpp
index 98fc789b2..049958ae5 100644
--- a/escher/src/tab_view.cpp
+++ b/escher/src/tab_view.cpp
@@ -68,14 +68,23 @@ View * TabView::subviewAtIndex(int index) {
 }
 
 void TabView::layoutSubviews() {
-  // Simple layout: all tabs have the same length
-  KDCoordinate tabLength = m_frame.width()/m_numberOfTabs;
+  KDCoordinate emptyWidth = bounds().width();
   for (int i=0; i<m_numberOfTabs; i++) {
+    emptyWidth -= m_cells[i].minimalSizeForOptimalDisplay().width();
+  }
+  KDCoordinate widthUsed = 0;
+  for (int i=0; i<m_numberOfTabs; i++) {
+    KDCoordinate tabWidth = m_cells[i].minimalSizeForOptimalDisplay().width() + emptyWidth/m_numberOfTabs;
+    /* Avoid a unused one-pixel-width vertical on the left due to rounding error */
+    if (i == m_numberOfTabs - 1) {
+      tabWidth = bounds().width() - widthUsed;
+    }
     KDRect cellFrame = KDRect(
-        i*tabLength, 0,
-        tabLength, m_frame.height() - 5
+        widthUsed, 0,
+        tabWidth, m_frame.height() - 5
         );
     m_cells[i].setFrame(cellFrame);
+    widthUsed += tabWidth;
   }
 }
 
diff --git a/escher/src/tab_view_cell.cpp b/escher/src/tab_view_cell.cpp
index b5c634829..0a2d20cbb 100644
--- a/escher/src/tab_view_cell.cpp
+++ b/escher/src/tab_view_cell.cpp
@@ -30,6 +30,10 @@ void TabViewCell::setSelected(bool selected) {
   markRectAsDirty(bounds());
 }
 
+KDSize TabViewCell::minimalSizeForOptimalDisplay() {
+  return KDText::stringSize(m_name, KDText::FontSize::Small);
+}
+
 void TabViewCell::drawRect(KDContext * ctx, KDRect rect) const {
   KDCoordinate height = bounds().height();
   KDCoordinate width = bounds().width();