diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index cae0bda..a4889e9 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -250,6 +250,12 @@ namespace ShiftOS.WinForms.Applications
             };
             txt.KeyDown += (o, a) =>
             {
+                if (a.Control == true || a.Alt == true)
+                {
+                    a.SuppressKeyPress = true;
+                    return;
+                }
+
                 if (a.KeyCode == Keys.Enter)
                 {
                     try
diff --git a/ShiftOS.WinForms/WindowBorder.cs b/ShiftOS.WinForms/WindowBorder.cs
index 2829a3e..0d351d2 100644
--- a/ShiftOS.WinForms/WindowBorder.cs
+++ b/ShiftOS.WinForms/WindowBorder.cs
@@ -134,14 +134,14 @@ namespace ShiftOS.WinForms
 
                 }
             };
-            
-            
+
+            this.Width = (LoadedSkin.LeftBorderWidth*2) + _parentWindow.Width + LoadedSkin.RightBorderWidth;
+            this.Height = (LoadedSkin.TitlebarHeight*2) + _parentWindow.Height + LoadedSkin.BottomBorderWidth;
+
             this.pnlcontents.Controls.Add(this._parentWindow);
             this._parentWindow.Dock = DockStyle.Fill;
             this._parentWindow.Show();
             SetupControls(this);
-            this.Width = LoadedSkin.LeftBorderWidth + this.Width + LoadedSkin.RightBorderWidth;
-            this.Height = LoadedSkin.TitlebarHeight + this.Height + LoadedSkin.BottomBorderWidth;
             ControlManager.SetupControls(this._parentWindow);
 
             Shiftorium.Installed += () =>