diff --git a/app/qml/TerminalTabs.qml b/app/qml/TerminalTabs.qml
index 8f741a2..0625c54 100644
--- a/app/qml/TerminalTabs.qml
+++ b/app/qml/TerminalTabs.qml
@@ -104,11 +104,15 @@ Item {
 
             Repeater {
                 model: tabsModel
-                onItemAdded: function(index, item) {
-                    if (index === tabBar.currentIndex)
-                        item.activate()
-                }
                 TerminalContainer {
+                    property bool isCurrentItem: StackLayout.isCurrentItem
+
+                    onIsCurrentItemChanged: {
+                        if (isCurrentItem) {
+                            activate()
+                        }
+                    }
+
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     onTitleChanged: tabsModel.setProperty(index, "title", title)
@@ -117,12 +121,4 @@ Item {
             }
         }
     }
-
-    Connections {
-        target: tabBar
-        onCurrentIndexChanged: {
-            if (stack.currentItem)
-                stack.currentItem.activate()
-        }
-    }
 }