diff --git a/oom/Composer/Composer.cpp b/oom/Composer/Composer.cpp
index be8accda..016b72bd 100644
--- a/oom/Composer/Composer.cpp
+++ b/oom/Composer/Composer.cpp
@@ -335,7 +335,7 @@ Composer::Composer(QMainWindow* parent, const char* name)
 
 	m_headerTabs->addTab(&virtualScroll, QString(tr("Navigator")));
 	m_headerTabs->addTab(m_tempoHeader, QString(tr("Tempo")));
-	m_headerTabs->setCornerWidget(headerCornerWidget(0));
+	m_headerTabs->setCornerWidget(headerCornerWidget(1));
 	connect(m_headerTabs, SIGNAL(currentChanged(int)), this, SLOT(headerTabChanged(int)));
 
 	m_tempoHeader->setStartTempo(m_tempoStart);
@@ -483,6 +483,7 @@ QWidget* Composer::headerCornerWidget(int tab)
 	connect(m_tempoRange, SIGNAL(maxChanged(double)), this, SLOT(setEndTempo(double)));
 	
 	m_headerToolBox->setCurrentIndex(tab);
+	m_headerTabs->setCurrentIndex(tab);
 	return m_headerToolBox;
 }
 
diff --git a/oom/Composer/Composer.h b/oom/Composer/Composer.h
index 974dbae0..7b3c1a97 100644
--- a/oom/Composer/Composer.h
+++ b/oom/Composer/Composer.h
@@ -131,7 +131,6 @@ private slots:
 	void resourceDockAreaChanged(Qt::DockWidgetArea);
 	void currentTabChanged(int);
 	void composerViewChanged();
-	void updateAll();
 	void updateScroll(int, int);
 	void headerTabChanged(int);
 	void setStartTempo(double);
@@ -168,6 +167,7 @@ public slots:
     void verticalScrollSetYpos(unsigned);
 	void preloadControllers();
 	void heartBeat();
+	void updateAll();
 
 public: