diff --git a/qml/cool-old-term/ShaderSettings.qml b/qml/cool-old-term/ShaderSettings.qml
index 815b3ac..e07a096 100644
--- a/qml/cool-old-term/ShaderSettings.qml
+++ b/qml/cool-old-term/ShaderSettings.qml
@@ -23,8 +23,9 @@ Item{
     property var fonts_list: fontlist
 
     onFont_indexChanged: {
-        //Reload the window to avoid ugly glitches
         terminalwindowloader.source = "";
+        currentfont.source = fontlist.get(font_index).source;
+        currentfont.pixelSize = fontlist.get(font_index).pixelSize;
         terminalwindowloader.source = "TerminalWindow.qml";
     }
 
diff --git a/qml/cool-old-term/TerminalWindow.qml b/qml/cool-old-term/TerminalWindow.qml
index 27cc056..af45e08 100644
--- a/qml/cool-old-term/TerminalWindow.qml
+++ b/qml/cool-old-term/TerminalWindow.qml
@@ -204,6 +204,8 @@ ApplicationWindow{
             //FIXME: Ugly forced clear terminal at the beginning
             Component.onCompleted: {
                 terminal.screen.sendKey("l", 76, 67108864);
+                terminal.setTerminalHeight();
+                terminal.setTerminalWidth();
             }
         }
 
diff --git a/qml/cool-old-term/main.qml b/qml/cool-old-term/main.qml
index 1a7d7db..a35297b 100644
--- a/qml/cool-old-term/main.qml
+++ b/qml/cool-old-term/main.qml
@@ -27,15 +27,13 @@
 import QtQuick 2.1
 import QtQuick.Window 2.0
 import QtQuick.Controls 1.0
-import QtGraphicalEffects 1.0
-
 Item{
     ShaderSettings{
         id: shadersettings
+        Component.onCompleted: terminalwindowloader.source = "TerminalWindow.qml"
     }
 
     Loader{
         id: terminalwindowloader
-        source: "TerminalWindow.qml"
     }
 }