diff --git a/include/ControllerView.h b/include/ControllerView.h
index 8903c0e3c..df8b6d310 100644
--- a/include/ControllerView.h
+++ b/include/ControllerView.h
@@ -62,7 +62,7 @@ public slots:
 	void deleteController();
 	void displayHelp();
 	void closeControls();
-
+	void renameController();
 
 signals:
 	void deleteController( ControllerView * _view );
diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp
index 4e07907b7..0b1d912c4 100644
--- a/src/gui/widgets/ControllerView.cpp
+++ b/src/gui/widgets/ControllerView.cpp
@@ -143,10 +143,7 @@ void ControllerView::deleteController()
 	emit( deleteController( this ) );
 }
 
-
-
-
-void ControllerView::mouseDoubleClickEvent( QMouseEvent * event )
+void ControllerView::renameController()
 {
 	bool ok;
 	Controller * c = castModel<Controller>();
@@ -162,6 +159,12 @@ void ControllerView::mouseDoubleClickEvent( QMouseEvent * event )
 }
 
 
+void ControllerView::mouseDoubleClickEvent( QMouseEvent * event )
+{
+	renameController();
+}
+
+
 
 void ControllerView::modelChanged()
 {
@@ -173,8 +176,9 @@ void ControllerView::contextMenuEvent( QContextMenuEvent * )
 {
 	QPointer<CaptionMenu> contextMenu = new CaptionMenu( model()->displayName(), this );
 	contextMenu->addAction( embed::getIconPixmap( "cancel" ),
-						tr( "&Remove this plugin" ),
+						tr( "&Remove this controller" ),
 						this, SLOT( deleteController() ) );
+	contextMenu->addAction( tr("Re&name this controller"), this, SLOT( renameController() ));
 	contextMenu->addSeparator();
 	contextMenu->addHelpAction();
 	contextMenu->exec( QCursor::pos() );
@@ -182,7 +186,6 @@ void ControllerView::contextMenuEvent( QContextMenuEvent * )
 }
 
 
-
 void ControllerView::displayHelp()
 {
 	QWhatsThis::showText( mapToGlobal( rect().center() ),