diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -470,8 +470,8 @@
 void TabbedViewContainer::currentTabChanged(int index)
 {
     if (index != -1) {
-        auto view = widget(index)->findChild<TerminalDisplay*>();
-        view->setFocus();
+        auto splitview = qobject_cast<ViewSplitter*>(widget(index));
+        auto view = splitview->activeTerminalDisplay();
         updateTabHistory(view);
         emit activeViewChanged(view);
         setTabActivity(index, false);