1 files changed, 10 insertions, 5 deletions

diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index bed7ef1..5fc3e8e 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -101,17 +101,17 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
 OTabWidget::~OTabWidget()
 {
 }
 
 void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
 {
     QPixmap iconset = loadSmooth( icon );
 
-    QTab * tab = new QTab();
+    QTab *tab = new QTab();
     if ( tabBarStyle == IconTab )
     {
         tab->label = QString::null;
     }
     else
     {
         tab->label = label;
     }
@@ -269,25 +269,30 @@ void OTabWidget::selectTab( OTabInfo *tab )
     if ( tabBarStyle == IconTab )
     {
         if ( currentTab )
         {
             tabBar->tab( currentTab->id() )->setText( "" );
             setUpLayout();
         }
         tabBar->tab( tab->id() )->setText( tab->label() );
-        currentTab = tab;
+        tabBar->setCurrentTab( tab->id() );
+        setUpLayout();
+        tabBar->update();
+    }
+    else
+    {
+        tabBar->setCurrentTab( tab->id() );
     }
-    tabBar->setCurrentTab( tab->id() );
-    setUpLayout();
-    tabBar->update();
 
     widgetStack->raiseWidget( tab->control() );
 
     emit currentChanged( tab->control() );
+
+    currentTab = tab;
 }
 
 void OTabWidget::setUpLayout()
 {
     tabBar->layoutTabs();
     QSize t( tabBarStack->sizeHint() );
     if ( t.width() > width() )
         t.setWidth( width() );