diff --git a/src/gui/draw.asm b/src/gui/draw.asm
index 0aaca3d..711660c 100644
--- a/src/gui/draw.asm
+++ b/src/gui/draw.asm
@@ -30,6 +30,9 @@ gui_draw_single_widget:
 
 	GFX     MOUSE_HIDE              ; On cache la souris AVANT de commencer le dessin du widget
 
+	mov		ax, GUI_RAM_SEG
+	mov		gs, ax
+
 	mov     al, [gs:si + widget.state]
 	cmp     al, [gs:si + widget.oldstate]
 	je      .done
diff --git a/src/gui/lib.asm b/src/gui/lib.asm
index 81326c9..27ca5ae 100644
--- a/src/gui/lib.asm
+++ b/src/gui/lib.asm
@@ -604,8 +604,12 @@ gui_process_all:
 ; Sortie : AL=1 si Clicked, 0 sinon. Met à jour [gs:si].state
 gui_update_logic:
 	push    ds
+	push    gs
+
 	mov     ax, BDA_DATA_SEG
 	mov     ds, ax
+	mov		ax, GUI_RAM_SEG
+	mov		gs, ax
 
 	mov     al, byte [gs:si + widget.state]
 	cmp     al, GUI_STATE_DISABLED
@@ -673,6 +677,7 @@ gui_update_logic:
 	xor     ax, ax
 
 	.done:
+	pop		gs
 	pop     ds
 	ret