diff --git a/src/runtime.c b/src/runtime.c
index cfaa115..b851e90 100644
--- a/src/runtime.c
+++ b/src/runtime.c
@@ -187,6 +187,7 @@ i32 orca_surface_callback(void* user)
 {
     orca_surface_create_data* data = (orca_surface_create_data*)user;
     data->surface = oc_surface_create_for_window(data->window, data->api);
+    oc_surface_swap_interval(data->surface, 0);
 
     //NOTE: this will be called on main thread, so we need to deselect the surface here,
     //      and reselect it on the orca thread
@@ -250,7 +251,6 @@ void orca_surface_render_commands(oc_surface surface,
 void debug_overlay_toggle(oc_debug_overlay* overlay)
 {
     overlay->show = !overlay->show;
-    oc_surface_set_hidden(overlay->surface, !overlay->show);
 
     if(overlay->show)
     {
@@ -673,6 +673,20 @@ i32 orca_runloop(void* user)
             }
         }
 
+        oc_surface_deselect();
+
+        if(exports[OC_EXPORT_FRAME_REFRESH])
+        {
+            M3Result res = m3_Call(exports[OC_EXPORT_FRAME_REFRESH], 0, 0);
+            if(res)
+            {
+                ORCA_WASM3_ABORT(app->runtime.m3Runtime, res, "Runtime error");
+            }
+        }
+
+        oc_surface_select(app->debugOverlay.surface);
+        oc_canvas_set_current(app->debugOverlay.canvas);
+
         if(app->debugOverlay.show)
         {
             oc_surface_bring_to_front(app->debugOverlay.surface);
@@ -804,27 +818,16 @@ i32 orca_runloop(void* user)
                 }
             }
 
-            oc_surface_select(app->debugOverlay.surface);
-            oc_canvas_set_current(app->debugOverlay.canvas);
             oc_ui_draw();
-
-            oc_render(app->debugOverlay.surface, app->debugOverlay.canvas);
         }
-
-        if(exports[OC_EXPORT_FRAME_REFRESH])
+        else
         {
-            M3Result res = m3_Call(exports[OC_EXPORT_FRAME_REFRESH], 0, 0);
-            if(res)
-            {
-                ORCA_WASM3_ABORT(app->runtime.m3Runtime, res, "Runtime error");
-            }
+            oc_set_color_rgba(0, 0, 0, 0);
+            oc_clear();
         }
 
-        if(app->debugOverlay.show)
-        {
-            oc_surface_select(app->debugOverlay.surface);
-            oc_surface_present(app->debugOverlay.surface);
-        }
+        oc_render(app->debugOverlay.surface, app->debugOverlay.canvas);
+        oc_surface_present(app->debugOverlay.surface);
 
         oc_arena_clear(oc_scratch());
     }
@@ -862,9 +865,7 @@ int main(int argc, char** argv)
     app->debugOverlay.maxEntries = 200;
     oc_arena_init(&app->debugOverlay.logArena);
 
-    oc_surface_swap_interval(app->debugOverlay.surface, 0);
-
-    oc_surface_set_hidden(app->debugOverlay.surface, true);
+    oc_surface_swap_interval(app->debugOverlay.surface, 1);
 
     oc_surface_deselect();