diff --git a/reactos/win32ss/gdi/eng/surface.c b/reactos/win32ss/gdi/eng/surface.c
index 6e08c550eec..20fde71d92b 100644
--- a/reactos/win32ss/gdi/eng/surface.c
+++ b/reactos/win32ss/gdi/eng/surface.c
@@ -339,12 +339,12 @@ EngCreateDeviceBitmap(
     /* Set the device handle */
     psurf->SurfObj.dhsurf = dhsurf;
 
-    /* Get the handle for the bitmap */
-    hbmp = (HBITMAP)psurf->SurfObj.hsurf;
-
     /* Set public ownership */
     GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);
 
+    /* Get the handle for the bitmap */
+    hbmp = (HBITMAP)psurf->SurfObj.hsurf;
+
     /* Unlock the surface and return */
     SURFACE_UnlockSurface(psurf);
     return hbmp;
@@ -377,12 +377,12 @@ EngCreateDeviceSurface(
     /* Set the device handle */
     psurf->SurfObj.dhsurf = dhsurf;
 
-    /* Get the handle for the surface */
-    hsurf = psurf->SurfObj.hsurf;
-
     /* Set public ownership */
     GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);
 
+    /* Get the handle for the surface */
+    hsurf = psurf->SurfObj.hsurf;
+
     /* Unlock the surface and return */
     SURFACE_UnlockSurface(psurf);
     return hsurf;