diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index 79f3966332..4c305a658f 100644
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -162,6 +162,7 @@ bool wxRibbonBar::Realize()
     wxClientDC dcTemp(this);
     int sep = m_art->GetMetric(wxRIBBON_ART_TAB_SEPARATION_SIZE);
     size_t numtabs = m_pages.GetCount();
+    bool firstVisible = true;
     size_t i;
     for(i = 0; i < numtabs; ++i)
     {
@@ -185,8 +186,10 @@ bool wxRibbonBar::Realize()
                               &info.small_must_have_separator_width,
                               &info.minimum_width);
 
-        if(i == 0)
+        if ( firstVisible )
         {
+            firstVisible = false;
+
             m_tabs_total_width_ideal = info.ideal_width;
             m_tabs_total_width_minimum = info.minimum_width;
         }