diff --git a/gfx/gl.c b/gfx/gl.c
index d574333623..47f4e825e9 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -953,13 +953,13 @@ static void* gl_init(video_info_t *video, const input_driver_t **input, void **i
    // Set up render to texture.
    gl_init_fbo(gl, 256 * video->input_scale, 256 * video->input_scale);
 
+   gl->vsync = video->vsync;
+   gl->keep_aspect = video->force_aspect;
+
    // Apparently need to set viewport for passes when we aren't using FBOs.
    gl_shader_use(1);
    set_viewport(gl, gl->win_width, gl->win_height, false);
 
-   gl->vsync = video->vsync;
-   gl->keep_aspect = video->force_aspect;
-
    bool force_smooth;
    if (gl_shader_filter_type(1, &force_smooth))
       gl->tex_filter = force_smooth ? GL_LINEAR : GL_NEAREST;