diff --git a/kernel/trunk/detect/biosdisk.inc b/kernel/trunk/detect/biosdisk.inc
index 2fc98039bf..e4ffd588cf 100644
--- a/kernel/trunk/detect/biosdisk.inc
+++ b/kernel/trunk/detect/biosdisk.inc
@@ -10,11 +10,14 @@
 
         xor     cx, cx
         mov     es, cx
+        inc     cx
         mov     di, 0x9080
         mov     byte [es:di-1], cl
+        mov     byte [es:di], 80h
+        inc     di
         cmp     [preboot_biosdisk], 1
         jnz     bdde
-        mov     dl, 80h
+        mov     dl, 81h
 bdds:
         mov     ah, 15h
         push    cx dx di
diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc
index 9080cb396c..ef4d13a59d 100644
--- a/kernel/trunk/gui/window.inc
+++ b/kernel/trunk/gui/window.inc
@@ -1290,14 +1290,19 @@ window._.set_window_box: ;/////////////////////////////////////////////////////
         add     esp, -BOX.sizeof
 
         mov     ebx, esp
+if WDATA.box
         lea     esi, [edi + WDATA.box]
+else
+	mov	esi, edi ; optimization for WDATA.box = 0
+end if
         xchg    eax, esi
         mov     ecx, BOX.sizeof
         call    memmove
         xchg    eax, esi
         xchg    ebx, esi
         call    memmove
-        xchg    ebx, esi
+        mov     eax, ebx
+        mov     ebx, esi
 
         call    window._.check_window_position
         call    window._.set_window_clientbox