diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 2d3c76736..8d5f89384 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -618,6 +618,7 @@ void ViewManager::controllerChanged(SessionController *controller)
         return;
     }
 
+    _viewContainer->setFocusProxy(controller->view());
     updateTerminalDisplayHistory(controller->view());
 
     _pluggedController = controller;