diff --git a/app/qml/TerminalContainer.qml b/app/qml/TerminalContainer.qml
index cf14a49..a8aacff 100644
--- a/app/qml/TerminalContainer.qml
+++ b/app/qml/TerminalContainer.qml
@@ -1,44 +1,20 @@
 import QtQuick 2.2
 
-Item{
+ShaderTerminal{
     property alias title: terminal.title
+    property alias terminalSize: terminal.terminalSize
 
-    Item{
-        id: scalableContent
-        width: parent.width * shadersettings.window_scaling
-        height: parent.height * shadersettings.window_scaling
+    id: shadercontainer
+    opacity: shadersettings.windowOpacity * 0.3 + 0.7
 
-        Loader{
-            id: frame
-            anchors.fill: parent
-            z: 2.1
-            source: shadersettings.frame_source
-        }
-        PreprocessedTerminal{
-            id: terminal
-            anchors.fill: parent
-        }
-        ShaderTerminal{
-            id: shadercontainer
-            anchors.fill: parent
-            opacity: shadersettings.windowOpacity * 0.3 + 0.7
-            z: 1.9
-        }
-
-        transform: Scale {
-            xScale: 1 / shadersettings.window_scaling
-            yScale: 1 / shadersettings.window_scaling
-        }
-    }
-
-    // Terminal size overlay. Shown when terminal size changes.
     Loader{
-        id: sizeoverlayloader
-        z: 3
-        anchors.centerIn: parent
-        active: shadersettings.show_terminal_size
-        sourceComponent: SizeOverlay{
-            terminalSize: terminal.terminalSize
-        }
+        id: frame
+        anchors.fill: parent
+        z: 2.1
+        source: shadersettings.frame_source
+    }
+    PreprocessedTerminal{
+        id: terminal
+        anchors.fill: parent
     }
 }
diff --git a/app/qml/main.qml b/app/qml/main.qml
index 47ef012..4ec8214 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -110,7 +110,13 @@ ApplicationWindow{
     }
     TerminalContainer{
         id: terminalContainer
-        anchors.fill: parent
+        width: parent.width * shadersettings.window_scaling
+        height: parent.height * shadersettings.window_scaling
+
+        transform: Scale {
+            xScale: 1 / shadersettings.window_scaling
+            yScale: 1 / shadersettings.window_scaling
+        }
     }
     SettingsWindow{
         id: settingswindow
@@ -120,5 +126,13 @@ ApplicationWindow{
         id: aboutDialog
         visible: false
     }
+    Loader{
+        anchors.centerIn: parent
+        active: shadersettings.show_terminal_size
+        sourceComponent: SizeOverlay{
+            z: 3
+            terminalSize: terminalContainer.terminalSize
+        }
+    }
     Component.onCompleted: shadersettings.handleFontChanged();
 }