diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
index 701410f402..930a5ce703 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
@@ -1,161 +1,164 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include "berryQtLogView.h"
 
 #include "berryQtLogPlugin.h"
 
 #include <berryIPreferencesService.h>
 #include <berryIBerryPreferences.h>
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 
 #include <QHeaderView>
 
 #include <QTimer>
 #include <QClipboard>
 
 namespace berry {
 
 QtLogView::QtLogView(QWidget *parent)
     : QWidget(parent)
 {
   berry::IPreferencesService::Pointer prefService
     = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
   
   
   prefs->PutBool("ShowAdvancedFields", false);
   prefs->PutBool("ShowCategory", true);
   bool showAdvancedFields = false;
      
 
   ui.setupUi(this);
   
   model = QtLogPlugin::GetInstance()->GetLogModel();
   model->SetShowAdvancedFiels( showAdvancedFields );
   
   filterModel = new QSortFilterProxyModel(this);
   filterModel->setSourceModel(model);
   filterModel->setFilterKeyColumn(-1);
 
   ui.tableView->setModel(filterModel);
  
   ui.tableView->verticalHeader()->setVisible(false);
   ui.tableView->horizontalHeader()->setStretchLastSection(true);
              
   connect( ui.filterContent, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotFilterChange( const QString& ) ) );
   connect( filterModel, SIGNAL( rowsInserted ( const QModelIndex &, int, int ) ), this, SLOT( slotRowAdded( const QModelIndex &, int , int  ) ) );
   connect( ui.ShowCategory, SIGNAL( clicked(bool checked)),this, SLOT(on_ShowAdvancedFields_clicked(checked)));
   connect( ui.SaveToClipboard, SIGNAL( clicked()),this, SLOT(on_SaveToClipboard_clicked()));
   
   ui.ShowAdvancedFields->setChecked( showAdvancedFields );
            
 }
 
 QtLogView::~QtLogView()
 {
 }
 
 void QtLogView::slotScrollDown( )
 {
   ui.tableView->scrollToBottom();
 }
 
 void QtLogView::slotFilterChange( const QString& q )
 {
   filterModel->setFilterRegExp(QRegExp(q, Qt::CaseInsensitive, QRegExp::FixedString));
 }
 
+
 void QtLogView::slotRowAdded ( const QModelIndex &  /*parent*/, int start, int end )
 {
-  static int first=false;
+  ui.tableView->resizeRowsToContents();
 
-  if(!first)
-  {
-    first=true;
-    ui.tableView->resizeColumnsToContents();
-    ui.tableView->resizeRowsToContents();
-  }
-  else
-    for(int r=start;r<=end;r++)
+  //only resize columns when first entry is added
+  static bool first = true;
+  if(first)
     {
-      ui.tableView->resizeRowToContents(r);
+    ui.tableView->resizeColumnsToContents();
+    first = false;
     }
 
   QTimer::singleShot(0,this,SLOT( slotScrollDown() ) );
 }
 
+void QtLogView::showEvent( QShowEvent * event )
+{
+  ui.tableView->resizeColumnsToContents();
+  ui.tableView->resizeRowsToContents();  
+}
+
 void QtLogView::on_ShowAdvancedFields_clicked( bool checked )
 {
   QtLogPlugin::GetInstance()->GetLogModel()->SetShowAdvancedFiels( checked );  
   ui.tableView->resizeColumnsToContents();
 
   berry::IPreferencesService::Pointer prefService
     = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
   
   prefs->PutBool("ShowAdvancedFields", checked);
   prefs->Flush();
 }
 
 void QtLogView::on_ShowCategory_clicked( bool checked )
 {
   QtLogPlugin::GetInstance()->GetLogModel()->SetShowCategory( checked );  
   ui.tableView->resizeColumnsToContents();
 
   berry::IPreferencesService::Pointer prefService
     = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
   
   prefs->PutBool("ShowCategory", checked);
   prefs->Flush();
 }
 
 void QtLogView::on_SaveToClipboard_clicked()
 {
   QClipboard *clipboard = QApplication::clipboard();
   QString loggingMessagesAsText = QString("");
   for (int i=0; i<ui.tableView->model()->rowCount(); i++)
     {
     for (int j=0; j<ui.tableView->model()->columnCount(); j++)
       {
       QModelIndex index = ui.tableView->model()->index(i, j);
       loggingMessagesAsText += ui.tableView->model()->data(index, Qt::DisplayRole).toString() + " ";
       }
     loggingMessagesAsText += "\n";
     }
 
   clipboard->setText(loggingMessagesAsText);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.h b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.h
index 7b259e4bed..5dab3138c4 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.h
@@ -1,54 +1,56 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYQTLOGVIEW_H
 #define BERRYQTLOGVIEW_H
 
 #include <QtGui/QWidget>           
 #include <QSortFilterProxyModel>
 
 #include "ui_berryQtLogView.h"
 
 #include "berryQtPlatformLogModel.h"
 
 namespace berry {
 
 class QtLogView : public QWidget
 {
     Q_OBJECT
     
 public:
     QtLogView(QWidget *parent = 0);
     ~QtLogView();
     QtPlatformLogModel *model;
     QSortFilterProxyModel *filterModel;
     
 private:
     Ui::QtLogViewClass ui;
+
+    void showEvent ( QShowEvent * event );
     
 protected slots:
     void slotFilterChange( const QString& );
     void slotRowAdded( const QModelIndex & , int , int  );
     void slotScrollDown( );
     void on_ShowAdvancedFields_clicked( bool checked = false );
     void on_ShowCategory_clicked( bool checked = false );
     void on_SaveToClipboard_clicked();
     
 };
 
 }
 
 #endif // BERRYQTLOGVIEW_H