diff --git a/quirks.c b/quirks.c
index 6db96e46..05d2dd5f 100644
--- a/quirks.c
+++ b/quirks.c
@@ -61,6 +61,8 @@ quirk_weston_csd_on(struct terminal *term)
 {
     if (term->window->use_csd != CSD_YES)
         return;
+    if (term->window->is_fullscreen)
+        return;
 
     for (int i = 0; i < ALEN(term->window->csd.surface); i++)
         quirk_weston_subsurface_desync_on(term->window->csd.sub_surface[i]);
@@ -71,6 +73,8 @@ quirk_weston_csd_off(struct terminal *term)
 {
     if (term->window->use_csd != CSD_YES)
         return;
+    if (term->window->is_fullscreen)
+        return;
 
     for (int i = 0; i < ALEN(term->window->csd.surface); i++)
         quirk_weston_subsurface_desync_off(term->window->csd.sub_surface[i]);