diff --git a/ui-sequencer.cc b/ui-sequencer.cc
index 5aa7739..e99af41 100644
--- a/ui-sequencer.cc
+++ b/ui-sequencer.cc
@@ -644,6 +644,11 @@ void T_SyncViewImpl_::displayToolbar( ) noexcept
 		TimeToString_( tBuffer , sizeof( tBuffer ) , sync.time( ) );
 		Text( "%s" , tBuffer );
 	}
+	SameLine( );
+	if ( ToolbarButton( ICON_FA_CLOCK_O , BtSize , "Change duration and time units." ) ) {
+		UI::Main( ).pushDialog( NewOwned< T_ChangeDurationDialog_ >(
+				sync.durationUnits( ) , sync.durationUnitSize( ) ) );
+	}
 
 	ToolbarSeparator( );
 
@@ -663,20 +668,14 @@ void T_SyncViewImpl_::displayToolbar( ) noexcept
 
 	if ( ToolbarButton( followTime ? ICON_FA_LOCK : ICON_FA_UNLOCK , BtSize ,
 			followTime ? "Follows the current position.\nClick to untie."
-				: "Not tied to the  current position.\nClick to follow." ) ) {
+				: "Not tied to the  current position.\nClick to follow." ,
+				true , followTime ) ) {
 		followTime = !followTime;
 	}
 
 	ToolbarSeparator( );
 
-	if ( ToolbarButton( ICON_FA_CLOCK_O , BtSize , "Change duration and time units." ) ) {
-		UI::Main( ).pushDialog( NewOwned< T_ChangeDurationDialog_ >(
-				sync.durationUnits( ) , sync.durationUnitSize( ) ) );
-	}
-
-	ToolbarSeparator( );
-
-	if ( ToolbarButton( ICON_FA_TAGS , BtSize , "Toggle track labels." ) ) {
+	if ( ToolbarButton( ICON_FA_TAGS , BtSize , "Toggle track labels." , true , showLabels ) ) {
 		showLabels = !showLabels;
 	}
 	SameLine( );