diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 655186c8f..ce2d1e577 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -357,12 +357,15 @@ _e_comp_nocomp_end(void)
         E_Layer layer = MAX(e_comp->nocomp_ec->saved.layer, E_LAYER_CLIENT_NORMAL);
         Eina_Bool fs;
 
-        if (!e_config->allow_above_fullscreen)
-          layer = E_LAYER_CLIENT_FULLSCREEN;
-        else if (e_config->mode.presentation)
-          layer = E_LAYER_CLIENT_TOP;
         fs = e_comp->nocomp_ec->fullscreen;
         e_comp->nocomp_ec->fullscreen = 0;
+        if (fs)
+          {
+             if (!e_config->allow_above_fullscreen)
+               layer = E_LAYER_CLIENT_FULLSCREEN;
+             else if (e_config->mode.presentation)
+               layer = E_LAYER_CLIENT_TOP;
+          }
         evas_object_layer_set(e_comp->nocomp_ec->frame, layer);
         e_comp->nocomp_ec->fullscreen = fs;
      }