diff --git a/src/tracks/BBTrack.cpp b/src/tracks/BBTrack.cpp
index c37c1466f..205a22087 100644
--- a/src/tracks/BBTrack.cpp
+++ b/src/tracks/BBTrack.cpp
@@ -635,5 +635,6 @@ bool BBTrackView::close()
 void BBTrackView::clickedTrackLabel()
 {
 	Engine::getBBTrackContainer()->setCurrentBB( m_bbTrack->index() );
-	gui->getBBEditor()->show();
+	gui->getBBEditor()->parentWidget()->show();
+	gui->getBBEditor()->setFocus( Qt::ActiveWindowFocusReason );
 }