diff --git a/app/qml/BurnInEffect.qml b/app/qml/BurnInEffect.qml
index ea73568..bc2bd9f 100644
--- a/app/qml/BurnInEffect.qml
+++ b/app/qml/BurnInEffect.qml
@@ -24,7 +24,7 @@ import "utils.js" as Utils
 Loader {
     id: burnInEffect
 
-    property ShaderEffectSource source: item ? item.source : null
+    property ShaderEffectSource effectSource: item ? item.source : null
 
     property real lastUpdate: 0
     property real prevLastUpdate: 0
diff --git a/app/qml/PreprocessedTerminal.qml b/app/qml/PreprocessedTerminal.qml
index c2a0fac..95f00d7 100644
--- a/app/qml/PreprocessedTerminal.qml
+++ b/app/qml/PreprocessedTerminal.qml
@@ -83,13 +83,6 @@ Item{
             terminalContainer.updateSources()
         }
     }
-    Connections {
-        target: terminalWindow
-
-        onActiveChanged: {
-            kterminal.forceActiveFocus()
-        }
-    }
 
     function updateSources() {
         kterminal.update()
diff --git a/app/qml/ShaderTerminal.qml b/app/qml/ShaderTerminal.qml
index 69a8451..4d791f1 100644
--- a/app/qml/ShaderTerminal.qml
+++ b/app/qml/ShaderTerminal.qml
@@ -73,7 +73,7 @@ Item {
         id: dynamicShader
 
         property ShaderEffectSource screenBuffer: frameBuffer
-        property ShaderEffectSource burnInSource: burnInEffect.source
+        property ShaderEffectSource burnInSource: burnInEffect.effectSource
         property ShaderEffectSource frameSource: terminalFrameLoader.item
 
         property color fontColor: parent.fontColor
diff --git a/app/qml/TerminalTabs.qml b/app/qml/TerminalTabs.qml
index 8fce43a..361a172 100644
--- a/app/qml/TerminalTabs.qml
+++ b/app/qml/TerminalTabs.qml
@@ -130,9 +130,9 @@ Item {
             Repeater {
                 model: tabsModel
                 TerminalContainer {
-                    property bool isCurrentItem: StackLayout.isCurrentItem
-                    onIsCurrentItemChanged: {
-                        if (isCurrentItem) {
+                    property bool shouldHaveFocus: terminalWindow.active && StackLayout.isCurrentItem
+                    onShouldHaveFocusChanged: {
+                        if (shouldHaveFocus) {
                             activate()
                         }
                     }