diff --git a/keyboard.h b/keyboard.h
index f5fd555..79e4957 100644
--- a/keyboard.h
+++ b/keyboard.h
@@ -163,6 +163,12 @@ kbd_unpress_key(struct kbd *kb, uint32_t time) {
 										WL_KEYBOARD_KEY_STATE_RELEASED);
 		}
 		kb->last_press = NULL;
+
+		if (compose >= 2) {
+			compose = 0;
+			kb->layout = kb->prevlayout;
+			kbd_draw_layout(kb);
+		}
 	}
 }
 
@@ -232,12 +238,6 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time) {
 		break;
 	}
 
-	if (compose == 3) {
-		compose = 0;
-		kb->layout = kb->prevlayout;
-		kbd_draw_layout(kb);
-	}
-
 	kb->surf->dirty = true;
 }