diff --git a/src/Part.cpp b/src/Part.cpp
index ed863e73e..62bc6f23c 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -216,8 +216,6 @@ void Part::activeViewChanged(SessionController* controller)
 	Q_ASSERT( controller );
 	Q_ASSERT( controller->view() );
 
-    widget()->setFocusProxy( controller->view() );
-
 	// remove existing controller
     if (_pluggedController) 
 	{
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 599cfc1c9..9595efd33 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -480,6 +480,8 @@ void ViewManager::controllerChanged(SessionController* controller)
 	if ( controller == _pluggedController )
 		return;
 
+	_viewSplitter->setFocusProxy(controller->view());
+
 	_pluggedController = controller;
 	emit activeViewChanged(controller);
 }