diff --git a/PCK-Studio/Rendering/Renderer.cs b/PCK-Studio/Rendering/Renderer.cs
index 23377b2b..ea4e1fa4 100644
--- a/PCK-Studio/Rendering/Renderer.cs
+++ b/PCK-Studio/Rendering/Renderer.cs
@@ -16,6 +16,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
 **/
 using System;
+using System.Drawing;
 using OpenTK.Graphics.OpenGL;
 using PckStudio.Rendering.Shader;
 
@@ -30,5 +31,10 @@ namespace PckStudio.Rendering
             context.IndexBuffer.Bind();
             GL.DrawElements(context.PrimitiveType, context.IndexBuffer.GetCount(), DrawElementsType.UnsignedInt, 0);
         }
+
+        public static void SetViewportSize(Size size)
+        {
+            GL.Viewport(size);
+        }
     }
 }
diff --git a/PCK-Studio/Rendering/Renderer3D.cs b/PCK-Studio/Rendering/Renderer3D.cs
index 1706b8a0..a12fd4ea 100644
--- a/PCK-Studio/Rendering/Renderer3D.cs
+++ b/PCK-Studio/Rendering/Renderer3D.cs
@@ -78,6 +78,7 @@ namespace PckStudio.Rendering
                 Camera.ViewportSize = ClientSize;
                 Camera.Update();
             }
+            Renderer.SetViewportSize(Camera.ViewportSize);
         }
     }
 }  
diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs
index e57cce69..5fcc6d25 100644
--- a/PCK-Studio/Rendering/SkinRenderer.cs
+++ b/PCK-Studio/Rendering/SkinRenderer.cs
@@ -676,8 +676,6 @@ namespace PckStudio.Rendering
 
             MakeCurrent(); 
 
-            GL.Viewport(Size);
-
             framebuffer.Bind();
             GL.ClearColor(BackColor);
             GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);