diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp
index 0b1d912c4..d6a020bce 100644
--- a/src/gui/widgets/ControllerView.cpp
+++ b/src/gui/widgets/ControllerView.cpp
@@ -154,6 +154,10 @@ void ControllerView::renameController()
 	if( ok && !new_name.isEmpty() )
 	{
 		c->setName( new_name );
+		if( getController()->type() == getController()->LfoController )
+		{
+			m_controllerDlg->setWindowTitle( "LFO (" + new_name + ")" );
+		}
 		m_nameLabel->setText( new_name );
 	}
 }