diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc
index 12f053cb16..7194f2e8a5 100644
--- a/kernel/trunk/gui/window.inc
+++ b/kernel/trunk/gui/window.inc
@@ -1288,6 +1288,20 @@ window._.set_window_box: ;/////////////////////////////////////////////////////
 ;------------------------------------------------------------------------------
         push    eax ebx esi
 
+; don't do anything if the new box is identical to the old
+	cmp	bl, [edi + WDATA.fl_wstate]
+	jnz	@f
+	mov	esi, eax
+	push	edi
+if WDATA.box
+	add	edi, WDATA.box
+end if
+	mov	ecx, 4
+	repz	cmpsd
+	pop	edi
+	jz	.exit
+@@:
+
         add     esp, -BOX.sizeof
 
         mov     ebx, esp
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index 96259eb493..dd98205201 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -3226,7 +3226,7 @@ redrawscreen:
 
         bgli:
 
-         cmp   ecx,1
+         cmp   dword[esp], 1
          jnz   .az
 ;         cmp   byte[BACKGROUND_CHANGED], 0
 ;         jnz   newdw8